Rigify: a number of small fixes.

- Don't try to add an update callback to CollectionProperty.
- Restore exact alignment of the super_finger master control to 1st bone.
- Add an option to run a sub-object after all methods of the parent.
- Fix wrong identifier in SideZ.from_parts.

2 files changed, 9 insertions, 3 deletions

diff --git a/rigify/utils/metaclass.py b/rigify/utils/metaclass.py
index 9e169e05..c9d4ec1a 100644
--- a/rigify/utils/metaclass.py
+++ b/rigify/utils/metaclass.py
@@ -135,6 +135,7 @@ class StagedMetaclass(type):
 
 class BaseStagedClass(object, metaclass=StagedMetaclass):
     rigify_sub_objects = tuple()
+    rigify_sub_object_run_late = False
 
     def rigify_invoke_stage(self, stage):
         """Call all methods decorated with the given stage, followed by the callback."""
@@ -145,11 +146,16 @@ class BaseStagedClass(object, metaclass=StagedMetaclass):
         getattr(self, stage)()
 
         for sub in self.rigify_sub_objects:
-            sub.rigify_invoke_stage(stage)
+            if not sub.rigify_sub_object_run_late:
+                sub.rigify_invoke_stage(stage)
 
         for method_name in cls.rigify_stage_map[stage]:
             getattr(self, method_name)()
 
+        for sub in self.rigify_sub_objects:
+            if sub.rigify_sub_object_run_late:
+                sub.rigify_invoke_stage(stage)
+
 
 #=============================================
 # Per-owner singleton class
diff --git a/rigify/utils/naming.py b/rigify/utils/naming.py
index 415dddaf..45307323 100644
--- a/rigify/utils/naming.py
+++ b/rigify/utils/naming.py
@@ -131,9 +131,9 @@ class SideZ(enum.IntEnum):
             if parts.side_z[1].lower() == 't':
                 return SideZ.TOP
             else:
-                return Side.BOTTOM
+                return SideZ.BOTTOM
         else:
-            return Side.MIDDLE
+            return SideZ.MIDDLE
 
     @staticmethod
     def to_string(parts, side):