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:
authorCampbell Barton <ideasman42@gmail.com>2017-03-20 01:25:39 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-03-20 01:32:40 +0300
commit3f818c7898af20eed05b05e911a697a25287c432 (patch)
tree74715f36df2a0b26e6e4f52b7ed6d0e27316f336 /release/scripts/startup/bl_ui/__init__.py
parent4137f30928dcfda4539d3d80df2c3e079eed12ec (diff)
parentdf76616d7450b99938f265283fad443186da4039 (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__.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py
index 7ce5733c6e2..2f91d3327cc 100644
--- a/release/scripts/startup/bl_ui/__init__.py
+++ b/release/scripts/startup/bl_ui/__init__.py
@@ -95,7 +95,10 @@ del _namespace
def register():
- bpy.utils.register_module(__name__)
+ from bpy.utils import register_class
+ for mod in _modules_loaded:
+ for cls in mod.classes:
+ register_class(cls)
# space_userprefs.py
from bpy.props import StringProperty, EnumProperty
@@ -144,8 +147,10 @@ def register():
def unregister():
- bpy.utils.unregister_module(__name__)
-
+ from bpy.utils import unregister_class
+ for mod in reversed(_modules_loaded):
+ for cls in reversed(mod.classes):
+ 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