From 58db64a3b638d7c40afcd72f29e861fa4b99c688 Mon Sep 17 00:00:00 2001 From: mano-wii Date: Wed, 17 Jul 2019 10:32:50 -0300 Subject: Revert "Fix T59713: Moving bones between layers in edit mode doesn't show the dot icon in the layers UI" This commit did not follow the protocol that requires a review first. This reverts commit 580acab1737c726f43e39792dbb75f3ca2089fcb. --- source/blender/editors/armature/armature_relations.c | 4 ---- 1 file changed, 4 deletions(-) (limited to '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 653c625fb18..2c61818d902 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -415,10 +415,6 @@ 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); } -- cgit v1.2.3