Rigify: move drivers together with constraints and code improvement.

1 files changed, 13 insertions, 3 deletions

diff --git a/rigify/utils/bones.py b/rigify/utils/bones.py
index 0142922c..7f178481 100644
--- a/rigify/utils/bones.py
+++ b/rigify/utils/bones.py
@@ -24,7 +24,7 @@ from mathutils import Vector, Matrix, Color
 from rna_prop_ui import rna_idprop_ui_prop_get
 
 from .errors import MetarigError
-from .naming import get_name, make_derived_name
+from .naming import get_name, make_derived_name, is_control_bone
 from .misc import pairwise
 
 #=======================
@@ -391,9 +391,19 @@ class BoneUtilityMixin(object):
         self.register_new_bone(name, bone_name)
         return name
 
-    def copy_bone_properties(self, src_name, tgt_name, **kwargs):
+    def copy_bone_properties(self, src_name, tgt_name, *, props=True, ui_controls=None, **kwargs):
         """Copy pose-mode properties of the bone."""
-        copy_bone_properties(self.obj, src_name, tgt_name, **kwargs)
+        if props:
+            if ui_controls is None and is_control_bone(tgt_name) and hasattr(self, 'script'):
+                ui_controls = [tgt_name]
+            elif ui_controls is True:
+                ui_controls = self.bones.flatten('ctrl')
+
+        copy_bone_properties(self.obj, src_name, tgt_name, props=props and not ui_controls, **kwargs)
+
+        if props and ui_controls:
+            from .mechanism import copy_custom_properties_with_ui
+            copy_custom_properties_with_ui(self, src_name, tgt_name, ui_controls=ui_controls)
 
     def rename_bone(self, old_name, new_name):
         """Rename the bone, returning the actual new name."""