2.5: Various Fixes

[blender-staging.git] / source / blender / makesrna / intern / rna_armature.c

diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c
index d77517f420db32003fc0c0c84c36c38344f6b5e9..cf20e92b2892a862bcfadc0e789d5778fd633533 100644 (file)
--- a/source/blender/makesrna/intern/rna_armature.c
+++ b/source/blender/makesrna/intern/rna_armature.c
@@ -157,6 +157,19 @@ static void rna_EditBone_name_set(PointerRNA *ptr, const char *value)
        ED_armature_bone_rename(arm, oldname, newname);
 }
 
+static void rna_Bone_name_set(PointerRNA *ptr, const char *value)
+{
+       bArmature *arm= (bArmature*)ptr->id.data;
+       Bone *bone= (Bone*)ptr->data;
+       char oldname[32], newname[32];
+       
+       /* need to be on the stack */
+       BLI_strncpy(newname, value, 32);
+       BLI_strncpy(oldname, bone->name, 32);
+       
+       ED_armature_bone_rename(arm, oldname, newname);
+}
+
 static void rna_EditBone_layer_get(PointerRNA *ptr, int values[16])
 {
        EditBone *data= (EditBone*)(ptr->data);
@@ -320,6 +333,7 @@ static void rna_def_bone_common(StructRNA *srna, int editbone)
        RNA_def_property_ui_text(prop, "Name", "");
        RNA_def_struct_name_property(srna, prop);
        if(editbone) RNA_def_property_string_funcs(prop, NULL, NULL, "rna_EditBone_name_set");
+       else RNA_def_property_string_funcs(prop, NULL, NULL, "rna_Bone_name_set");
        RNA_def_property_update(prop, 0, "rna_Armature_redraw_data");
 
        /* flags */
@@ -573,6 +587,7 @@ void rna_def_armature(BlenderRNA *brna)
        RNA_def_property_ui_text(prop, "Visible Layers", "Armature layer visibility.");
        RNA_def_property_boolean_funcs(prop, NULL, "rna_Armature_layer_set");
        RNA_def_property_update(prop, NC_OBJECT|ND_POSE, NULL);
+       RNA_def_property_flag(prop, PROP_LIB_EXCEPTION);
        
                /* layer protection */
        prop= RNA_def_property(srna, "layer_protection", PROP_BOOLEAN, PROP_NONE);