[Bf-blender-cvs] [580acab1737] master: Fix T59713: Moving bones between layers in edit mode doesn't show the dot icon in the layers UI

[mano-wii]

Commit: 580acab1737c726f43e39792dbb75f3ca2089fcb
Author: mano-wii
Date:   Wed Jul 17 10:16:17 2019 -0300
Branches: master
https://developer.blender.org/rB580acab1737c726f43e39792dbb75f3ca2089fcb

Fix T59713: Moving bones between layers in edit mode doesn't show the dot icon in the layers UI

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

M	source/blender/editors/armature/armature_relations.c

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

diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c
index 2c61818d902..653c625fb18 100644
--- a/source/blender/editors/armature/armature_relations.c
+++ b/source/blender/editors/armature/armature_relations.c
@@ -415,6 +415,10 @@ int join_armature_exec(bContext *C, wmOperator *op)
         }
       }
 
+      arm->layer_used |= curarm->layer_used;
+      arm->layer |= curarm->layer;
+      arm->layer_protected |= curarm->layer_protected;
+
       /* Free the old object data */
       ED_object_base_free_and_unlink(bmain, scene, ob_iter);
     }