fix: IK rot2pole toggle: ORG scan for connected children only

add: strip_mch

Author: eigen-value

rigs/limbs/arm.py

@@ -4,7 +4,7 @@
 from .limb_utils     import *
 from mathutils       import Vector
 from ...utils       import copy_bone, flip_bone, put_bone, create_cube_widget
-from ...utils       import strip_org, make_deformer_name, create_widget
+from ...utils       import strip_org, strip_mch, make_deformer_name, create_widget
 from ...utils       import create_circle_widget, create_sphere_widget, create_line_widget
 from ...utils       import MetarigError, make_mechanism_name, org
 from ...utils       import create_limb_widget, connected_children_names
@@ -990,9 +990,9 @@ def get_future_names(bones):
 
         names = dict()
 
-        uarm = strip_org(bones[0].name)
-        farm = strip_org(bones[1].name)
-        hand = strip_org(bones[2].name)
+        uarm = strip_mch(strip_org(bones[0].name))
+        farm = strip_mch(strip_org(bones[1].name))
+        hand = strip_mch(strip_org(bones[2].name))
 
         suffix=''
         if uarm[-2:] == '.L' or uarm[-2:] == '.R':

rigs/limbs/leg.py

@@ -5,7 +5,7 @@
 from .limb_utils import *
 from mathutils import Vector
 from ...utils import copy_bone, flip_bone, put_bone, create_cube_widget
-from ...utils import strip_org, make_deformer_name, create_widget
+from ...utils import strip_org, strip_mch, make_deformer_name, create_widget
 from ...utils import create_circle_widget, create_sphere_widget, create_line_widget
 from ...utils import MetarigError, make_mechanism_name, org
 from ...utils import create_limb_widget, connected_children_names
@@ -1294,25 +1294,15 @@ def create_drivers(self, bones):
     @staticmethod
     def get_future_names(bones):
 
-        if len(bones) != 5:
+        if len(bones) != 4:
             return
 
         names = dict()
 
-        thigh = strip_org(bones[0].name)
-        shin = strip_org(bones[1].name)
-
-        foot = strip_org(bones[2].name)
-
-        bone3 = strip_org(bones[3].name)
-        bone4 = strip_org(bones[4].name)
-
-        if bones[3].bone.use_connect:
-            toe = bone3
-            heel = bone4
-        else:
-            toe = bone4
-            heel = bone3
+        thigh = strip_mch(strip_org(bones[0].name))
+        shin = strip_mch(strip_org(bones[1].name))
+        foot = strip_mch(strip_org(bones[2].name))
+        toe = strip_mch(strip_org(bones[3].name))
 
         suffix = ''
         if thigh[-2:] == '.L' or thigh[-2:] == '.R':
@@ -1321,7 +1311,6 @@ def get_future_names(bones):
             shin = shin.rstrip(suffix)
             foot = foot.rstrip(suffix)
             toe = toe.rstrip(suffix)
-            heel = heel.rstrip(suffix)
 
         # the following is declared in rig_ui
         # controls = ['thigh_ik.R', 'thigh_fk.R', 'shin_fk.R', 'foot_fk.R', 'toe.R', 'foot_heel_ik.R', 'foot_ik.R',

rigs/limbs/paw.py

@@ -3,7 +3,7 @@
 from .limb_utils import *
 from mathutils import Vector
 from ...utils import copy_bone, flip_bone, put_bone, create_cube_widget
-from ...utils import strip_org, make_deformer_name, create_widget
+from ...utils import strip_org, strip_mch, make_deformer_name, create_widget
 from ...utils import create_circle_widget, create_sphere_widget, create_line_widget
 from ...utils import MetarigError, make_mechanism_name, org
 from ...utils import create_limb_widget, connected_children_names
@@ -1127,12 +1127,10 @@ def get_future_names(bones):
 
         names = dict()
 
-        thigh = strip_org(bones[0].name)
-        shin = strip_org(bones[1].name)
-
-        foot = strip_org(bones[2].name)
-
-        toe = strip_org(bones[3].name)
+        thigh = strip_mch(strip_org(bones[0].name))
+        shin = strip_mch(strip_org(bones[1].name))
+        foot = strip_mch(strip_org(bones[2].name))
+        toe = strip_mch(strip_org(bones[3].name))
 
         suffix = ''
         if thigh[-2:] == '.L' or thigh[-2:] == '.R':

rigs/utils.py

@@ -1,4 +1,5 @@
 from .limbs.super_limb import Rig as LimbRig
+from ..utils import connected_children_names
 import re
 
 
@@ -11,10 +12,10 @@ def get_limb_generated_names(rig):
         super_limb_orgs = []
         if re.match('^ORG', b.name) and b.rigify_type == 'limbs.super_limb':
             super_limb_orgs.append(b)
-            children = b.children_recursive
+            children = connected_children_names(rig, b.name)
             for child in children:
-                if re.match('^ORG', child.name):
-                    super_limb_orgs.append(child)
+                if re.match('^ORG', child) or re.match('^MCH', child):
+                    super_limb_orgs.append(pbones[child])
             names[b.name] = LimbRig.get_future_names(super_limb_orgs)
 
     return names

ui.py

@@ -1105,6 +1105,7 @@ def rotPoleToggle(rig, window='ALL', value=False, toggle=False, bake=False):
                         bpy.ops.anim.keyframe_insert_menu(type='Scaling')
                 limb_generated_names.pop(group)
                 break
+    scn.frame_set(0)
 
 
 class OBJECT_OT_IK2FK(bpy.types.Operator):

utils.py

@@ -107,6 +107,14 @@ def strip_org(name):
 org_name = strip_org
 
 
+def strip_mch(name):
+    """ Returns the name with ORG_PREFIX stripped from it.
+        """
+    if name.startswith(MCH_PREFIX):
+        return name[len(MCH_PREFIX):]
+    else:
+        return name
+
 def org(name):
     """ Prepends the ORG_PREFIX to a name if it doesn't already have
         it, and returns it.