[Bf-extensions-cvs] [daa0fa6] master: xedit: bugfix for rotation chooser GUI

[NBurn]

Commit: daa0fa6b7e437fc238ec1042b4fcce46f0118397
Author: NBurn
Date:   Fri Apr 30 16:58:28 2021 -0400
Branches: master
https://developer.blender.org/rBACdaa0fa6b7e437fc238ec1042b4fcce46f0118397

xedit: bugfix for rotation chooser GUI

Fixing bug / regression that prevented possible new Free locations
from being drawn when rotating out of a 'flat' angle.

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

M	exact_edit/__init__.py
M	exact_edit/xedit_set_meas.py

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

diff --git a/exact_edit/__init__.py b/exact_edit/__init__.py
index 4772f68..950c395 100644
--- a/exact_edit/__init__.py
+++ b/exact_edit/__init__.py
@@ -21,7 +21,7 @@ END GPL LICENSE BLOCK
 bl_info = {
     "name": "Exact Edit",
     "author": "nBurn",
-    "version": (0, 3, 2),
+    "version": (0, 3, 3),
     "blender": (2, 80, 0),
     "location": "View3D",
     "description": "Tool for precisely setting distance, scale, and rotation",
diff --git a/exact_edit/xedit_set_meas.py b/exact_edit/xedit_set_meas.py
index 0b36d38..271a9dd 100644
--- a/exact_edit/xedit_set_meas.py
+++ b/exact_edit/xedit_set_meas.py
@@ -1572,6 +1572,20 @@ def draw_callback_px(self, context):
     lk_pts2d = None  # lock points 2D
     self.meas_btn.is_drawn = False  # todo : cleaner btn activation
 
+    # if the addon_mode is WAIT_FOR_POPUP, wait on POPUP to disable
+    # popup_active, then run process_popup_input
+    # would prefer not to do pop-up check inside draw_callback, but not sure
+    # how else to check for input. need higher level "input handler" class?
+    if self.addon_mode == WAIT_FOR_POPUP:
+        global popup_active
+        if not popup_active:
+            process_popup_input(self)
+            set_help_text(self, "CLICK")
+
+    elif self.addon_mode == GET_0_OR_180:
+        choose_0_or_180(TransDat.lock_pts[2], TransDat.rot_pt_pos,
+                TransDat.rot_pt_neg, TransDat.ang_diff_r, self.mouse_co)
+
     # note, can't chain above if-elif block in with one below as
     # it breaks axis lock drawing
     if self.grab_pt is not None:  # not enabled if mod_pt active
@@ -1974,19 +1988,6 @@ class XEDIT_OT_set_meas(bpy.types.Operator):
             exit_addon(self)
             return {'FINISHED'}
 
-        # if the addon_mode is WAIT_FOR_POPUP, wait on POPUP to disable
-        # popup_active, then run process_popup_input
-        # would prefer not to do pop-up check inside draw_callback, but not sure
-        # how else to check for input. need higher level "input handler" class?
-        if self.addon_mode == WAIT_FOR_POPUP:
-            if not popup_active:
-                process_popup_input(self)
-                set_help_text(self, "CLICK")
-
-        elif self.addon_mode == GET_0_OR_180:
-            choose_0_or_180(TransDat.lock_pts[2], TransDat.rot_pt_pos,
-                    TransDat.rot_pt_neg, TransDat.ang_diff_r, self.mouse_co)
-
         return {'RUNNING_MODAL'}
 
     def invoke(self, context, event):