[Bf-blender-cvs] [6804035] master: Remove module reloading for preview operators

Campbell Barton noreply at git.blender.org
Wed Jun 22 04:15:12 CEST 2016


Commit: 68040359d1fe2e817c864393cf225a438f1fe1ab
Author: Campbell Barton
Date:   Wed Jun 22 08:47:40 2016 +1000
Branches: master
https://developer.blender.org/rB68040359d1fe2e817c864393cf225a438f1fe1ab

Remove module reloading for preview operators

This can be kept on file level but best keep out of operator functions.

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

M	release/scripts/startup/bl_operators/file.py

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

diff --git a/release/scripts/startup/bl_operators/file.py b/release/scripts/startup/bl_operators/file.py
index 64cc0ae..51e0791 100644
--- a/release/scripts/startup/bl_operators/file.py
+++ b/release/scripts/startup/bl_operators/file.py
@@ -97,13 +97,9 @@ class WM_OT_previews_batch_generate(Operator):
         return {'RUNNING_MODAL'}
 
     def execute(self, context):
-        if "subprocess" in locals():
-            import imp
-            imp.reload(preview_render)
-        else:
-            import os
-            import subprocess
-            from bl_previews_utils import bl_previews_render as preview_render
+        import os
+        import subprocess
+        from bl_previews_utils import bl_previews_render as preview_render
 
         context.window_manager.progress_begin(0, len(self.files))
         context.window_manager.progress_update(0)
@@ -210,13 +206,9 @@ class WM_OT_previews_batch_clear(Operator):
         return {'RUNNING_MODAL'}
 
     def execute(self, context):
-        if "subprocess" in locals():
-            import imp
-            imp.reload(preview_render)
-        else:
-            import os
-            import subprocess
-            from bl_previews_utils import bl_previews_render as preview_render
+        import os
+        import subprocess
+        from bl_previews_utils import bl_previews_render as preview_render
 
         context.window_manager.progress_begin(0, len(self.files))
         context.window_manager.progress_update(0)




More information about the Bf-blender-cvs mailing list