Merge branch 'master' into wm-drag-drop-rewritewm-drag-drop-rewrite

1 files changed, 18 insertions, 4 deletions

diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c
index 3afbd0405fe..8454d5c125f 100644
--- a/source/blender/makesrna/intern/rna_armature.c
+++ b/source/blender/makesrna/intern/rna_armature.c
@@ -176,6 +176,20 @@ static void rna_Armature_redraw_data(Main *UNUSED(bmain), Scene *UNUSED(scene),
   WM_main_add_notifier(NC_GEOM | ND_DATA, id);
 }
 
+/* Unselect bones when hidden */
+static void rna_Bone_hide_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
+{
+  bArmature *arm = (bArmature *)ptr->owner_id;
+  Bone *bone = (Bone *)ptr->data;
+
+  if (bone->flag & BONE_HIDDEN_P) {
+    bone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
+  }
+
+  WM_main_add_notifier(NC_OBJECT | ND_POSE, arm);
+  DEG_id_tag_update(&arm->id, ID_RECALC_COPY_ON_WRITE);
+}
+
 /* called whenever a bone is renamed */
 static void rna_Bone_update_renamed(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
@@ -301,8 +315,7 @@ static void rna_Bone_layer_set(PointerRNA *ptr, const bool *values)
   Bone *bone = (Bone *)ptr->data;
 
   rna_bone_layer_set(&bone->layer, values);
-
-  BKE_armature_refresh_layer_used(arm);
+  BKE_armature_refresh_layer_used(NULL, arm);
 }
 
 /* TODO: remove the deprecation stubs. */
@@ -1144,7 +1157,8 @@ static void rna_def_bone(BlenderRNA *brna)
       prop,
       "Hide",
       "Bone is not visible when it is not in Edit Mode (i.e. in Object or Pose Modes)");
-  RNA_def_property_update(prop, 0, "rna_Armature_redraw_data");
+  RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, -1);
+  RNA_def_property_update(prop, 0, "rna_Bone_hide_update");
 
   prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "flag", BONE_SELECTED);
@@ -1313,7 +1327,7 @@ static void rna_def_edit_bone(BlenderRNA *brna)
       prop,
       "Editbone Matrix",
       "Matrix combining loc/rot of the bone (head position, direction and roll), "
-      "in armature space (WARNING: does not include/support bone's length/size)");
+      "in armature space (does not include/support bone's length/size)");
   RNA_def_property_float_funcs(prop, "rna_EditBone_matrix_get", "rna_EditBone_matrix_set", NULL);
 
   RNA_api_armature_edit_bone(srna);