[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3718] trunk/py/scripts/addons: code cleanup: ensure modal_handler_add() is called directly before returning.

Campbell Barton ideasman42 at gmail.com
Thu Sep 6 01:01:56 CEST 2012


Revision: 3718
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3718
Author:   campbellbarton
Date:     2012-09-05 23:01:55 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
code cleanup: ensure modal_handler_add() is called directly before returning.

Modified Paths:
--------------
    trunk/py/scripts/addons/io_anim_acclaim/__init__.py
    trunk/py/scripts/addons/io_anim_c3d/__init__.py
    trunk/py/scripts/addons/modules/selection_utils.py
    trunk/py/scripts/addons/space_view3d_panel_measure.py
    trunk/py/scripts/addons/space_view3d_screencast_keys.py
    trunk/py/scripts/addons/system_demo_mode/demo_mode.py

Modified: trunk/py/scripts/addons/io_anim_acclaim/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_anim_acclaim/__init__.py	2012-09-05 20:01:06 UTC (rev 3717)
+++ trunk/py/scripts/addons/io_anim_acclaim/__init__.py	2012-09-05 23:01:55 UTC (rev 3718)
@@ -390,9 +390,9 @@
         return {'PASS_THROUGH'}
 
     def execute(self, context):
-        context.window_manager.modal_handler_add(self)
         self.timer = context.window_manager.\
             event_timer_add(0.001, context.window)
+        context.window_manager.modal_handler_add(self)
         return {'RUNNING_MODAL'}
 
     def cancel(self, context):

Modified: trunk/py/scripts/addons/io_anim_c3d/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_anim_c3d/__init__.py	2012-09-05 20:01:06 UTC (rev 3717)
+++ trunk/py/scripts/addons/io_anim_c3d/__init__.py	2012-09-05 23:01:55 UTC (rev 3718)
@@ -87,9 +87,9 @@
         return {'PASS_THROUGH'}
 
     def execute(self, context):
-        context.window_manager.modal_handler_add(self)
         self.timer = context.window_manager.\
             event_timer_add(0.001, context.window)
+        context.window_manager.modal_handler_add(self)
         return {'RUNNING_MODAL'}
 
     def cancel(self, context):

Modified: trunk/py/scripts/addons/modules/selection_utils.py
===================================================================
--- trunk/py/scripts/addons/modules/selection_utils.py	2012-09-05 20:01:06 UTC (rev 3717)
+++ trunk/py/scripts/addons/modules/selection_utils.py	2012-09-05 23:01:55 UTC (rev 3718)
@@ -72,8 +72,9 @@
         return {'PASS_THROUGH'}
 
     def invoke(self, context, event):
+        self.update(context)
+
         context.window_manager.modal_handler_add(self)
-        self.update(context)
         return {'RUNNING_MODAL'}
 
 

Modified: trunk/py/scripts/addons/space_view3d_panel_measure.py
===================================================================
--- trunk/py/scripts/addons/space_view3d_panel_measure.py	2012-09-05 20:01:06 UTC (rev 3717)
+++ trunk/py/scripts/addons/space_view3d_panel_measure.py	2012-09-05 23:01:55 UTC (rev 3718)
@@ -922,7 +922,6 @@
                 # Add the region OpenGL drawing callback
                 for WINregion in context.area.regions:
                     if WINregion.type == 'WINDOW':
-                        context.window_manager.modal_handler_add(self)
                         self._handle = WINregion.callback_add(
                             draw_measurements_callback,
                             (self, context),
@@ -930,6 +929,7 @@
 
                         print("Measure panel display callback added")
 
+                        context.window_manager.modal_handler_add(self)
                         return {'RUNNING_MODAL'}
 
             return {'CANCELLED'}

Modified: trunk/py/scripts/addons/space_view3d_screencast_keys.py
===================================================================
--- trunk/py/scripts/addons/space_view3d_screencast_keys.py	2012-09-05 20:01:06 UTC (rev 3717)
+++ trunk/py/scripts/addons/space_view3d_screencast_keys.py	2012-09-05 23:01:55 UTC (rev 3718)
@@ -592,7 +592,6 @@
             if context.window_manager.screencast_keys_keys is False:
                 # operator is called for the first time, start everything
                 context.window_manager.screencast_keys_keys = True
-                context.window_manager.modal_handler_add(self)
                 self.key = []
                 self.time = []
                 self.mouse = []
@@ -605,6 +604,7 @@
                 self._timer = context.window_manager.event_timer_add(0.025,
                     context.window)
                 ScreencastKeysStatus.overall_time.insert(0, time.time())
+                context.window_manager.modal_handler_add(self)
                 return {'RUNNING_MODAL'}
             else:
                 # operator is called again, stop displaying

Modified: trunk/py/scripts/addons/system_demo_mode/demo_mode.py
===================================================================
--- trunk/py/scripts/addons/system_demo_mode/demo_mode.py	2012-09-05 20:01:06 UTC (rev 3717)
+++ trunk/py/scripts/addons/system_demo_mode/demo_mode.py	2012-09-05 23:01:55 UTC (rev 3718)
@@ -396,8 +396,8 @@
             return {'CANCELLED'}
         else:
             DemoMode.enabled = True
+
             context.window_manager.modal_handler_add(self)
-
             return {'RUNNING_MODAL'}
 
     def cancel(self, context):



More information about the Bf-extensions-cvs mailing list