[Bf-blender-cvs] [9fdbffb4b2b] master: Fix T62162: Bones set to unselectable can be fully selected through the viewport in edit mode.

Sebastian Parborg noreply at git.blender.org
Sat Mar 9 11:37:17 CET 2019


Commit: 9fdbffb4b2b61edffedf5ba2987f9f40b37b5389
Author: Sebastian Parborg
Date:   Sat Mar 9 11:35:13 2019 +0100
Branches: master
https://developer.blender.org/rB9fdbffb4b2b61edffedf5ba2987f9f40b37b5389

Fix T62162: Bones set to unselectable can be fully selected through the viewport in edit mode.

Bone selectability in edit mode now matches the behavior of pose mode
(can no longer be selected).

Reviewed By: Brecht

Differential Revision: http://developer.blender.org/D4469

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

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

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

diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c
index 8d58ee28f5c..658392f77aa 100644
--- a/source/blender/editors/armature/armature_select.c
+++ b/source/blender/editors/armature/armature_select.c
@@ -631,6 +631,10 @@ bool ED_armature_edit_select_pick(bContext *C, const int mval[2], bool extend, b
 		ED_view3d_viewcontext_init_object(&vc, basact->object);
 		bArmature *arm = vc.obedit->data;
 
+		if (!EBONE_SELECTABLE(arm, nearBone)) {
+			return false;
+		}
+
 		if (!extend && !deselect && !toggle) {
 			uint objects_len = 0;
 			Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(vc.view_layer, vc.v3d, &objects_len);



More information about the Bf-blender-cvs mailing list