Rigify: move drivers together with constraints and code improvement.

3 files changed, 4 insertions, 16 deletions

diff --git a/rigify/rigs/basic/pivot.py b/rigify/rigs/basic/pivot.py
index 963d1fbe..0301790f 100644
--- a/rigify/rigs/basic/pivot.py
+++ b/rigify/rigs/basic/pivot.py
@@ -24,7 +24,6 @@ from ...base_rig import BaseRig
 
 from ...utils.naming import make_derived_name
 from ...utils.bones import set_bone_widget_transform
-from ...utils.mechanism import copy_custom_properties_with_ui
 from ...utils.widgets import layout_widget_dropdown, create_registered_widget
 from ...utils.widgets_basic import create_pivot_widget
 from ...utils.switch_parent import SwitchParentBuilder
@@ -119,9 +118,7 @@ class Rig(BaseRig):
         ctrl = self.bones.ctrl
         main_ctl = ctrl.master if self.make_control else ctrl.pivot
 
-        self.copy_bone_properties(org, main_ctl, props=False)
-
-        copy_custom_properties_with_ui(self, org, main_ctl)
+        self.copy_bone_properties(org, main_ctl, ui_controls=True)
 
 
     def rig_bones(self):
diff --git a/rigify/rigs/basic/raw_copy.py b/rigify/rigs/basic/raw_copy.py
index 2ebbe133..e562038c 100644
--- a/rigify/rigs/basic/raw_copy.py
+++ b/rigify/rigs/basic/raw_copy.py
@@ -21,7 +21,7 @@
 import bpy
 
 from ...utils.naming import strip_org, strip_prefix, choose_derived_bone, is_control_bone
-from ...utils.mechanism import copy_custom_properties_with_ui
+from ...utils.mechanism import copy_custom_properties_with_ui, move_all_constraints
 from ...utils.widgets import layout_widget_dropdown, create_registered_widget
 
 from ...base_rig import BaseRig
@@ -66,13 +66,7 @@ class RelinkConstraintsMixin:
 
     def relink_move_constraints(self, from_bone, to_bone, *, prefix=''):
         if self.params.relink_constraints:
-            src = self.get_bone(from_bone).constraints
-            dest = self.get_bone(to_bone).constraints
-
-            for con in list(src):
-                if con.name.startswith(prefix):
-                    dest.copy(con)
-                    src.remove(con)
+            move_all_constraints(self.obj, from_bone, to_bone, prefix=prefix)
 
 
     def relink_bone_parent(self, bone_name):
diff --git a/rigify/rigs/basic/super_copy.py b/rigify/rigs/basic/super_copy.py
index 19047579..e2f70842 100644
--- a/rigify/rigs/basic/super_copy.py
+++ b/rigify/rigs/basic/super_copy.py
@@ -23,7 +23,6 @@ import bpy
 from ...base_rig import BaseRig
 
 from ...utils.naming import strip_org, make_deformer_name
-from ...utils.mechanism import copy_custom_properties_with_ui
 from ...utils.widgets import layout_widget_dropdown, create_registered_widget
 from ...utils.widgets_basic import create_bone_widget
 
@@ -78,9 +77,7 @@ class Rig(BaseRig, RelinkConstraintsMixin):
         bones = self.bones
 
         if self.make_control:
-            self.copy_bone_properties(bones.org, bones.ctrl, props=False)
-
-            copy_custom_properties_with_ui(self, bones.org, bones.ctrl)
+            self.copy_bone_properties(bones.org, bones.ctrl)
 
 
     def rig_bones(self):