Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormano-wii <germano.costa@ig.com.br>2019-07-17 16:16:17 +0300
committermano-wii <germano.costa@ig.com.br>2019-07-17 16:16:17 +0300
commit580acab1737c726f43e39792dbb75f3ca2089fcb (patch)
tree2aa1b0da087838cdd5c53d94a1dd7a384859fcdd /source/blender/editors/armature/armature_relations.c
parent11741ff682f84357a6bb58ade2f31628f3a8d517 (diff)
Fix T59713: Moving bones between layers in edit mode doesn't show the dot icon in the layers UI
Diffstat (limited to 'source/blender/editors/armature/armature_relations.c')
-rw-r--r--source/blender/editors/armature/armature_relations.c4
1 files changed, 4 insertions, 0 deletions
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);
}