diff options
| author | Sebastian Parborg <darkdefende@gmail.com> | 2019-04-09 13:29:02 +0300 |
|---|---|---|
| committer | Sebastian Parborg <darkdefende@gmail.com> | 2019-04-09 13:29:02 +0300 |
| commit | cc74020b5ac7d974e91279e23efc80141c229b3c (patch) | |
| tree | b48fe326706a8974f30385f8d861bcdd2bda0e7e /source/blender/editors/armature/armature_select.c | |
| parent | f55026d46861a3cb0108ad3f7bab8ed0610f660d (diff) | |
Fix T62114: Wireframe mode selection: selects backside objects when clicking frontside object in 3d-window
Now the depth order of objects when trying to select them is only used when not in X-ray mode.
Before, this was only the case in wireframe mode regardless of X-ray settings.
I've also unified the usage of V3D_XRAY and XRAY_FLAG as they were basically copies of each other.
Reviewed By: Clément
Differential Revision: http://developer.blender.org/D4504
Diffstat (limited to 'source/blender/editors/armature/armature_select.c')
| -rw-r--r-- | source/blender/editors/armature/armature_select.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c index 6e93ecc484d..4aab80bcbdd 100644 --- a/source/blender/editors/armature/armature_select.c +++ b/source/blender/editors/armature/armature_select.c @@ -419,7 +419,7 @@ static EditBone *get_nearest_editbonepoint( if (use_cycle) { static int last_mval[2] = {-100, -100}; - if (vc->v3d->shading.type > OB_WIRE) { + if (!XRAY_ACTIVE(vc->v3d)) { do_nearest = true; if (len_manhattan_v2v2_int(vc->mval, last_mval) <= WM_EVENT_CURSOR_MOTION_THRESHOLD) { do_nearest = false; @@ -428,7 +428,7 @@ static EditBone *get_nearest_editbonepoint( copy_v2_v2_int(last_mval, vc->mval); } else { - if (vc->v3d->shading.type > OB_WIRE) { + if (!XRAY_ACTIVE(vc->v3d)) { do_nearest = true; } } |