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:32:50 +0300
committermano-wii <germano.costa@ig.com.br>2019-07-17 16:32:50 +0300
commit58db64a3b638d7c40afcd72f29e861fa4b99c688 (patch)
tree923b6e08a9668275d74aad17f6e8de193c70c72a
parent580acab1737c726f43e39792dbb75f3ca2089fcb (diff)
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.
-rw-r--r--source/blender/editors/armature/armature_relations.c4
1 files changed, 0 insertions, 4 deletions
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);
}