diff options
| -rw-r--r-- | release/scripts/op/animsys_update.py | 1 | ||||
| -rw-r--r-- | release/scripts/ui/properties_data_bone.py | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_armature.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/release/scripts/op/animsys_update.py b/release/scripts/op/animsys_update.py index 8ae299e4e77..7392030f62e 100644 --- a/release/scripts/op/animsys_update.py +++ b/release/scripts/op/animsys_update.py @@ -367,6 +367,7 @@ data_path_update = [ ("PoseBone", "ik_limit_z", "use_ik_limit_z"), ("PoseBone", "ik_lin_control", "use_ik_linear_control"), ("PoseBone", "ik_rot_control", "use_ik_rotation_control"), + ("Bone", "use_hinge", "use_inherit_rotate"), ("SPHFluidSettings", "spring_k", "spring_force"), ("SPHFluidSettings", "stiffness_k", "stiffness"), ("SPHFluidSettings", "stiffness_knear", "stiffness_near"), diff --git a/release/scripts/ui/properties_data_bone.py b/release/scripts/ui/properties_data_bone.py index 3ed05d914ed..a9defd7217f 100644 --- a/release/scripts/ui/properties_data_bone.py +++ b/release/scripts/ui/properties_data_bone.py @@ -163,7 +163,7 @@ class BONE_PT_relations(BoneButtonsPanel, bpy.types.Panel): sub = col.column() sub.active = (bone.parent is not None) sub.prop(bone, "use_connect") - sub.prop(bone, "use_hinge", text="Inherit Rotation") + sub.prop(bone, "use_inherit_rotate", text="Inherit Rotation") sub.prop(bone, "use_inherit_scale", text="Inherit Scale") sub = col.column() sub.active = (not bone.parent or not bone.use_connect) diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index d42cf625898..ad1d8d3bf7f 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -414,7 +414,7 @@ static void rna_def_bone_common(StructRNA *srna, int editbone) RNA_def_property_ui_text(prop, "Connected", "When bone has a parent, bone's head is struck to the parent's tail"); RNA_def_property_update(prop, 0, "rna_Armature_update_data"); - prop= RNA_def_property(srna, "use_hinge", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_inherit_rotate", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", BONE_HINGE); RNA_def_property_ui_text(prop, "Inherit Rotation", "Bone inherits rotation or scale from parent bone"); RNA_def_property_update(prop, 0, "rna_Armature_update_data"); |