Commit: 58db64a3b638d7c40afcd72f29e861fa4b99c688
Author: mano-wii
Date: Wed Jul 17 10:32:50 2019 -0300
Branches: master
https://developer.blender.org/rB58db64a3b638d7c40afcd72f29e861fa4b99c688
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.
===================================================================
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 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);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
