[Bf-blender-cvs] [e9659d0e6e2] master: Fix failing assert when dragging panel close to region edge

[Hans Goudey]

Commit: e9659d0e6e22d55ba85ed24412fb866293b20c5a
Author: Hans Goudey
Date:   Fri Jun 5 10:05:47 2020 -0400
Branches: master
https://developer.blender.org/rBe9659d0e6e22d55ba85ed24412fb866293b20c5a

Fix failing assert when dragging panel close to region edge

Forgot to include this change from Julian Eisel @Severin in the
previous commit.

===================================================================

M       source/blender/editors/interface/view2d_ops.c

===================================================================

diff --git a/source/blender/editors/interface/view2d_ops.c 
b/source/blender/editors/interface/view2d_ops.c
index ff35b25e488..98bbd7af943 100644
--- a/source/blender/editors/interface/view2d_ops.c
+++ b/source/blender/editors/interface/view2d_ops.c
@@ -436,8 +436,8 @@ static float edge_pan_speed(v2dViewPanData *vpd,
   ARegion *region = vpd->region;
 
   /* Find the distance from the start of the drag zone. */
-  int min = x_dir ? region->winrct.xmin : region->winrct.ymin + 
EDGE_PAN_REGION_PAD;
-  int max = x_dir ? region->winrct.xmax : region->winrct.ymax - 
EDGE_PAN_REGION_PAD;
+  int min = (x_dir ? region->winrct.xmin : region->winrct.ymin) + 
EDGE_PAN_REGION_PAD;
+  int max = (x_dir ? region->winrct.xmax : region->winrct.ymax) - 
EDGE_PAN_REGION_PAD;
   int distance = 0.0;
   if (event_loc > max) {
     distance = event_loc - max;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs