diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-29 12:20:53 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-29 12:20:53 +0300 |
| commit | 2be098a1a02da30617516d32e6cd1409644c005e (patch) | |
| tree | cdb437a3da41d0b9a28b49dc8a517f0f7cb5c597 /release/scripts/startup/bl_ui/__init__.py | |
| parent | ff3e1fa7609f3371b8a93251ab7b7c53a2227382 (diff) | |
| parent | c2d3bb709044b7a2730b9fb5005657f38eaff6f2 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/__init__.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py index 2f91d3327cc..c5772101df8 100644 --- a/release/scripts/startup/bl_ui/__init__.py +++ b/release/scripts/startup/bl_ui/__init__.py @@ -23,8 +23,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 = [ @@ -150,7 +149,8 @@ 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) # Define a default UIList, when a list does not need any custom drawing... # Keep in sync with its #defined name in UI_interface.h |