[Bf-blender-cvs] [3ce06a8011e] master: Fix T80643: Library Override: Can't change Armature Layer enabled-ness.

Bastien Montagne noreply at git.blender.org
Mon Sep 14 11:33:47 CEST 2020


Commit: 3ce06a8011eb276dd3447ff1101bb3eecfe9e4d7
Author: Bastien Montagne
Date:   Mon Sep 14 11:32:45 2020 +0200
Branches: master
https://developer.blender.org/rB3ce06a8011eb276dd3447ff1101bb3eecfe9e4d7

Fix T80643: Library Override: Can't change Armature Layer enabled-ness.

Armature properties still had to be made overridable.

===================================================================

M	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 155943b3b8d..c0a46c65969 100644
--- a/source/blender/makesrna/intern/rna_armature.c
+++ b/source/blender/makesrna/intern/rna_armature.c
@@ -886,6 +886,8 @@ static void rna_def_bone_common(StructRNA *srna, int editbone)
   }
   RNA_def_property_update(prop, 0, "rna_Bone_update_renamed");
 
+  RNA_define_lib_overridable(true);
+
   /* flags */
   prop = RNA_def_property(srna, "layers", PROP_BOOLEAN, PROP_LAYER_MEMBER);
   RNA_def_property_boolean_sdna(prop, NULL, "layer", 1);
@@ -1116,6 +1118,8 @@ static void rna_def_bone_common(StructRNA *srna, int editbone)
   RNA_def_property_flag(prop, PROP_EDITABLE | PROP_PTR_NO_OWNERSHIP);
   RNA_def_property_ui_text(
       prop, "B-Bone End Handle", "Bone that serves as the end handle for the B-Bone curve");
+
+  RNA_define_lib_overridable(false);
 }
 
 /* err... bones should not be directly edited (only editbones should be...) */
@@ -1149,6 +1153,8 @@ static void rna_def_bone(BlenderRNA *brna)
   rna_def_bone_common(srna, 0);
   rna_def_bone_curved_common(srna, false, false);
 
+  RNA_define_lib_overridable(true);
+
   /* XXX should we define this in PoseChannel wrapping code instead?
    *     But PoseChannels directly get some of their flags from here... */
   prop = RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE);
@@ -1231,6 +1237,8 @@ static void rna_def_bone(BlenderRNA *brna)
   RNA_def_property_clear_flag(prop, PROP_EDITABLE);
   RNA_def_property_ui_text(prop, "Length", "Length of the bone");
 
+  RNA_define_lib_overridable(false);
+
   RNA_api_bone(srna);
 }
 
@@ -1461,6 +1469,8 @@ static void rna_def_armature(BlenderRNA *brna)
   /* Animation Data */
   rna_def_animdata_common(srna);
 
+  RNA_define_lib_overridable(true);
+
   /* Collections */
   prop = RNA_def_property(srna, "bones", PROP_COLLECTION, PROP_NONE);
   RNA_def_property_collection_sdna(prop, NULL, "bonebase", NULL);
@@ -1554,6 +1564,8 @@ static void rna_def_armature(BlenderRNA *brna)
   RNA_def_property_boolean_funcs(prop, "rna_Armature_is_editmode_get", NULL);
   RNA_def_property_clear_flag(prop, PROP_EDITABLE);
   RNA_def_property_ui_text(prop, "Is Editmode", "True when used in editmode");
+
+  RNA_define_lib_overridable(false);
 }
 
 void RNA_def_armature(BlenderRNA *brna)



More information about the Bf-blender-cvs mailing list