[Bf-blender-cvs] [cdf01f77504] blender-v2.92-release: Cleanup: use switch for Add Object Tool event handling

Campbell Barton noreply at git.blender.org
Sun Jan 31 07:07:16 CET 2021


Commit: cdf01f7750405107c0c4519f7793e2de886d7365
Author: Campbell Barton
Date:   Sat Jan 30 20:51:18 2021 +1100
Branches: blender-v2.92-release
https://developer.blender.org/rBcdf01f7750405107c0c4519f7793e2de886d7365

Cleanup: use switch for Add Object Tool event handling

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

M	source/blender/editors/space_view3d/view3d_placement.c

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

diff --git a/source/blender/editors/space_view3d/view3d_placement.c b/source/blender/editors/space_view3d/view3d_placement.c
index f8af73b45c5..c75d9796265 100644
--- a/source/blender/editors/space_view3d/view3d_placement.c
+++ b/source/blender/editors/space_view3d/view3d_placement.c
@@ -1342,13 +1342,18 @@ static int view3d_interactive_add_modal(bContext *C, wmOperator *op, const wmEve
       }
     }
   }
-
-  if (ELEM(event->type, EVT_ESCKEY, RIGHTMOUSE)) {
-    view3d_interactive_add_exit(C, op);
-    return OPERATOR_CANCELLED;
-  }
-  if (event->type == MOUSEMOVE) {
-    do_cursor_update = true;
+  else {
+    switch (event->type) {
+      case EVT_ESCKEY:
+      case RIGHTMOUSE: {
+        view3d_interactive_add_exit(C, op);
+        return OPERATOR_CANCELLED;
+      }
+      case MOUSEMOVE: {
+        do_cursor_update = true;
+        break;
+      }
+    }
   }
 
   if (ipd->wait_for_input) {



More information about the Bf-blender-cvs mailing list