[Bf-blender-cvs] [cf8aa209678] master: Fix error in the last commit

Pablo Dobarro noreply at git.blender.org
Tue Oct 20 22:34:08 CEST 2020


Commit: cf8aa209678c4b35ed18c9d385d5346d400fe672
Author: Pablo Dobarro
Date:   Tue Oct 20 22:32:56 2020 +0200
Branches: master
https://developer.blender.org/rBcf8aa209678c4b35ed18c9d385d5346d400fe672

Fix error in the last commit

I accidentally commited a file without saving it

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

M	source/blender/windowmanager/intern/wm_gesture_ops.c

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

diff --git a/source/blender/windowmanager/intern/wm_gesture_ops.c b/source/blender/windowmanager/intern/wm_gesture_ops.c
index fe21935ec88..faafd6c8235 100644
--- a/source/blender/windowmanager/intern/wm_gesture_ops.c
+++ b/source/blender/windowmanager/intern/wm_gesture_ops.c
@@ -29,7 +29,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_scene_types.h"
 #include "DNA_windowmanager_types.h"
 
 #include "BLI_math.h"
@@ -47,6 +46,8 @@
 #include "ED_screen.h"
 #include "ED_select_utils.h"
 
+#include "UI_interface.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -695,7 +696,7 @@ int WM_gesture_lasso_modal(bContext *C, wmOperator *op, const wmEvent *event)
         }
         /* make a simple distance check to get a smoother lasso
          * add only when at least 2 pixels between this and previous location */
-        else if ((x * x + y * y) > (2 * UI_DPI_FAC) ^ 2) {
+        else if ((x * x + y * y) > pow2f(2.0f * UI_DPI_FAC)) {
           lasso += 2;
           lasso[0] = event->x - gesture->winrct.xmin;
           lasso[1] = event->y - gesture->winrct.ymin;



More information about the Bf-blender-cvs mailing list