[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [1576] trunk/py/scripts/addons/rigify: rigify update for manual registeration.

[Campbell Barton]

Revision: 1576
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=1576
Author:   campbellbarton
Date:     2011-02-11 03:30:41 +0000 (Fri, 11 Feb 2011)
Log Message:
-----------
rigify update for manual registeration.

Modified Paths:
--------------
    trunk/py/scripts/addons/rigify/__init__.py
    trunk/py/scripts/addons/rigify/metarig_menu.py
    trunk/py/scripts/addons/rigify/ui.py

Modified: trunk/py/scripts/addons/rigify/__init__.py
===================================================================
--- trunk/py/scripts/addons/rigify/__init__.py	2011-02-11 03:14:34 UTC (rev 1575)
+++ trunk/py/scripts/addons/rigify/__init__.py	2011-02-11 03:30:41 UTC (rev 1576)
@@ -74,7 +74,7 @@
                     # Check if it's a rig itself
                     if not hasattr(rig, "Rig"):
                         # Check for sub-rigs
-                        ls = get_rig_list(os.path.join(path, f, "")) # "" adds a final slash
+                        ls = get_rig_list(os.path.join(path, f, ""))  # "" adds a final slash
                         rigs.extend(["%s.%s" % (f, l) for l in ls])
                     else:
                         rigs += [f]
@@ -127,8 +127,12 @@
 ##### REGISTER #####
 
 def register():
-    bpy.utils.register_module(__name__)
+    ui.register()
+    metarig_menu.register()
 
+    bpy.utils.register_class(RigifyName)
+    bpy.utils.register_class(RigifyParameters)
+
     bpy.types.PoseBone.rigify_type = bpy.props.StringProperty(name="Rigify Type", description="Rig type for this bone.")
     bpy.types.PoseBone.rigify_parameters = bpy.props.CollectionProperty(type=RigifyParameters)
 
@@ -137,12 +141,8 @@
     IDStore.rigify_types = bpy.props.CollectionProperty(type=RigifyName)
     IDStore.rigify_active_type = bpy.props.IntProperty(name="Rigify Active Type", description="The selected rig type.")
 
-    metarig_menu.register()
 
-
 def unregister():
-    bpy.utils.unregister_module(__name__)
-
     del bpy.types.PoseBone.rigify_type
     del bpy.types.PoseBone.rigify_parameters
 
@@ -151,5 +151,8 @@
     del IDStore.rigify_types
     del IDStore.rigify_active_type
 
+    bpy.utils.unregister_class(RigifyName)
+    bpy.utils.unregister_class(RigifyParameters)
+
     metarig_menu.unregister()
-
+    ui.unregister()

Modified: trunk/py/scripts/addons/rigify/metarig_menu.py
===================================================================
--- trunk/py/scripts/addons/rigify/metarig_menu.py	2011-02-11 03:14:34 UTC (rev 1575)
+++ trunk/py/scripts/addons/rigify/metarig_menu.py	2011-02-11 03:30:41 UTC (rev 1576)
@@ -46,14 +46,13 @@
 
 
 def register():
-    bpy.utils.register_module(__name__)
+    bpy.utils.register_class(AddHuman)
 
-    #bpy.types.register(AddHuman)
     bpy.types.INFO_MT_armature_add.append(menu_func)
 
 
 def unregister():
-    bpy.utils.unregister_module(__name__)
+    bpy.utils.unregister_class(AddHuman)
 
     #bpy.types.unregister(AddHuman)
     bpy.types.INFO_MT_armature_add.remove(menu_func)

Modified: trunk/py/scripts/addons/rigify/ui.py
===================================================================
--- trunk/py/scripts/addons/rigify/ui.py	2011-02-11 03:14:34 UTC (rev 1575)
+++ trunk/py/scripts/addons/rigify/ui.py	2011-02-11 03:30:41 UTC (rev 1576)
@@ -233,23 +233,16 @@
 #import space_info  # ensure the menu is loaded first
 
 def register():
-    bpy.utils.register_module(__name__)
+    bpy.utils.register_class(DATA_PT_rigify_buttons)
+    bpy.utils.register_class(BONE_PT_rigify_buttons)
+    bpy.utils.register_class(Generate)
+    bpy.utils.register_class(Sample)
 
-    #bpy.types.register(DATA_PT_rigify_buttons)
-    #bpy.types.register(BONE_PT_rigify_buttons)
-    #bpy.types.register(Generate)
-    #bpy.types.register(Sample)
-
     #space_info.INFO_MT_armature_add.append(ui.menu_func)
-    pass
 
 
 def unregister():
-    bpy.utils.unregister_module(__name__)
-
-    #bpy.types.unregister(DATA_PT_rigify_buttons)
-    #bpy.types.unregister(BONE_PT_rigify_buttons)
-    #bpy.types.unregister(Generate)
-    #bpy.types.unregister(Sample)
-    pass
-
+    bpy.types.unregister(DATA_PT_rigify_buttons)
+    bpy.types.unregister(BONE_PT_rigify_buttons)
+    bpy.types.unregister(Generate)
+    bpy.types.unregister(Sample)