diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-02-11 03:11:17 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-11 03:11:17 +0300 |
commit | fb8c135584292ddb8ddb7fe5060cac8f941100e2 (patch) | |
tree | b379555e39eabedb5db83d581063cb0a98d7c837 /release | |
parent | 8fd81ab9e61e29aad78ebe3bcc6cc8741219f629 (diff) |
minor python register changes.
- KeyingSetInfo classes are now collected like Panels, Operators etc so bpy.utils.register_module() can be used.
- move bpy.types.register() to bpy.utils.register_class
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/io/netrender/ui.py | 6 | ||||
-rw-r--r-- | release/scripts/keyingsets/keyingsets_builtins.py | 30 | ||||
-rw-r--r-- | release/scripts/modules/bpy/utils.py | 12 | ||||
-rw-r--r-- | release/scripts/modules/bpy_types.py | 4 | ||||
-rw-r--r-- | release/scripts/templates/builtin_keyingset.py | 2 |
5 files changed, 16 insertions, 38 deletions
diff --git a/release/scripts/io/netrender/ui.py b/release/scripts/io/netrender/ui.py index 1583dee427f..343c60e7865 100644 --- a/release/scripts/io/netrender/ui.py +++ b/release/scripts/io/netrender/ui.py @@ -374,9 +374,9 @@ def addProperties(): class NetRenderJob(bpy.types.IDPropertyGroup): pass - bpy.types.register(NetRenderSettings) - bpy.types.register(NetRenderSlave) - bpy.types.register(NetRenderJob) + bpy.utils.register_class(NetRenderSettings) + bpy.utils.register_class(NetRenderSlave) + bpy.utils.register_class(NetRenderJob) from bpy.props import PointerProperty, StringProperty, BoolProperty, EnumProperty, IntProperty, CollectionProperty bpy.types.Scene.network_render = PointerProperty(type=NetRenderSettings, name="Network Render", description="Network Render Settings") diff --git a/release/scripts/keyingsets/keyingsets_builtins.py b/release/scripts/keyingsets/keyingsets_builtins.py index 2a6bd682bf7..cff4aecac54 100644 --- a/release/scripts/keyingsets/keyingsets_builtins.py +++ b/release/scripts/keyingsets/keyingsets_builtins.py @@ -352,38 +352,14 @@ class BUILTIN_KSI_WholeCharacter(bpy.types.KeyingSetInfo): # for now, just add all of 'em ksi.addProp(ks, bone, '["%s"]' % (prop)) -############################### - -classes = [ - BUILTIN_KSI_Location, - BUILTIN_KSI_Rotation, - BUILTIN_KSI_Scaling, - - BUILTIN_KSI_LocRot, - BUILTIN_KSI_LocScale, - BUILTIN_KSI_LocRotScale, - BUILTIN_KSI_RotScale, - - BUILTIN_KSI_WholeCharacter, - - BUILTIN_KSI_VisualLoc, - BUILTIN_KSI_VisualRot, - BUILTIN_KSI_VisualLocRot, - - BUILTIN_KSI_Available, -] - def register(): - register = bpy.types.register - for cls in classes: - register(cls) + bpy.utils.register_module(__name__) def unregister(): - unregister = bpy.types.unregister - for cls in classes: - unregister(cls) + bpy.utils.unregister_module(__name__) + if __name__ == "__main__": register() diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py index 9d7b1fe3420..c806aa1e0e6 100644 --- a/release/scripts/modules/bpy/utils.py +++ b/release/scripts/modules/bpy/utils.py @@ -23,6 +23,9 @@ This module contains utility functions specific to blender but not assosiated with blenders internal data. """ +from _bpy import register_class +from _bpy import unregister_class + from _bpy import blend_paths from _bpy import script_paths as _bpy_script_paths from _bpy import user_resource as _user_resource @@ -576,18 +579,14 @@ def user_resource(type, path="", create=False): return target_path -_register_types = _bpy.types.Panel, _bpy.types.Operator, _bpy.types.Menu, _bpy.types.Header, _bpy.types.RenderEngine - - def register_module(module): import traceback total = 0 - register = _bpy.types.register for cls, path, line in _bpy_types.TypeMap.get(module, ()): if not "bl_rna" in cls.__dict__: total += 1 try: - register(cls) + register_class(cls) except: print("bpy.utils.register_module(): failed to registering class '%s.%s'" % (cls.__module__, cls.__name__)) print("\t", path, "line", line) @@ -599,13 +598,12 @@ def register_module(module): def unregister_module(module): import traceback - unregister = _bpy.types.unregister total = 0 for cls, path, line in _bpy_types.TypeMap.get(module, ()): if "bl_rna" in cls.__dict__: total += 1 try: - unregister(cls) + unregister_class(cls) except: print("bpy.utils.unregister_module(): failed to unregistering class '%s.%s'" % (cls.__module__, cls.__name__)) print("\t", path, "line", line) diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index 43bd3f4ff26..b11ef203df5 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -641,6 +641,10 @@ class RenderEngine(StructRNA, metaclass=RNAMeta): __slots__ = () +class KeyingSetInfo(StructRNA, metaclass=RNAMeta): + __slots__ = () + + class _GenericUI: __slots__ = () diff --git a/release/scripts/templates/builtin_keyingset.py b/release/scripts/templates/builtin_keyingset.py index 799f305d8b4..715b77d3dbd 100644 --- a/release/scripts/templates/builtin_keyingset.py +++ b/release/scripts/templates/builtin_keyingset.py @@ -26,4 +26,4 @@ class BUILTIN_KSI_hello(bpy.types.KeyingSetInfo): ks.paths.add(id_block, "show_x_ray", group_method='NONE') # manually register -bpy.types.register(BUILTIN_KSI_hello) +bpy.utils.register_class(BUILTIN_KSI_hello) |