Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTianwei Shen <shentianweipku@gmail.com>2017-04-15 16:44:48 +0300
committerTianwei Shen <shentianweipku@gmail.com>2017-04-15 16:44:48 +0300
commitf11ff0e672b8df79cdab85c8bebbd8c36c2c1cff (patch)
treec80138a7af123907c3eb26fee978644c702795cf /release/scripts/startup/bl_operators/__init__.py
parent473653f33798b727148e8f6379f31cbba95de479 (diff)
parent97c9c6a3f321f35f0b58ab167aea97a790c94cfb (diff)
Merge branch 'master' into soc-2016-multiviewsoc-2016-multiview
Diffstat (limited to 'release/scripts/startup/bl_operators/__init__.py')
-rw-r--r--release/scripts/startup/bl_operators/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_operators/__init__.py b/release/scripts/startup/bl_operators/__init__.py
index c28c1461003..1e0dbe6925e 100644
--- a/release/scripts/startup/bl_operators/__init__.py
+++ b/release/scripts/startup/bl_operators/__init__.py
@@ -21,8 +21,7 @@
# support reloading sub-modules
if "bpy" in locals():
from importlib import reload
- for val in _modules_loaded:
- reload(val)
+ _modules_loaded[:] = [reload(val) for val in _modules_loaded]
del reload
_modules = [
@@ -73,4 +72,5 @@ def unregister():
from bpy.utils import unregister_class
for mod in reversed(_modules_loaded):
for cls in reversed(mod.classes):
- unregister_class(cls)
+ if cls.is_registered:
+ unregister_class(cls)