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:
authorSebastian Parborg <darkdefende@gmail.com>2019-03-09 13:35:13 +0300
committerSebastian Parborg <darkdefende@gmail.com>2019-03-09 13:35:13 +0300
commit9fdbffb4b2b61edffedf5ba2987f9f40b37b5389 (patch)
tree663c5fc30fa40f5233f9a545979768dccbfed551 /source/blender/editors/armature/armature_select.c
parenta0f2923fd821099039c6350f3e8666d1d4d37ec9 (diff)
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
Diffstat (limited to 'source/blender/editors/armature/armature_select.c')
-rw-r--r--source/blender/editors/armature/armature_select.c4
1 files changed, 4 insertions, 0 deletions
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);