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/draw/engines | |
| 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/draw/engines')
3 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index 56ef4b97dcf..303178c1a5e 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -405,7 +405,7 @@ void GPENCIL_cache_init(void *vedata) /* xray mode */ if (v3d) { - stl->storage->is_xray = (v3d->shading.flag & V3D_XRAY_FLAG(v3d)) ? 1 : 0; + stl->storage->is_xray = XRAY_ACTIVE(v3d); } else { stl->storage->is_xray = 0; diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c index 45f1c632a05..a6c41f41198 100644 --- a/source/blender/draw/engines/workbench/workbench_forward.c +++ b/source/blender/draw/engines/workbench/workbench_forward.c @@ -38,6 +38,7 @@ #include "DNA_modifier_types.h" #include "DNA_node_types.h" +#include "ED_view3d.h" #include "GPU_shader.h" #include "GPU_texture.h" diff --git a/source/blender/draw/engines/workbench/workbench_render.c b/source/blender/draw/engines/workbench/workbench_render.c index c551a369b58..7ad8eea1c6e 100644 --- a/source/blender/draw/engines/workbench/workbench_render.c +++ b/source/blender/draw/engines/workbench/workbench_render.c @@ -28,6 +28,8 @@ #include "DRW_render.h" +#include "ED_view3d.h" + #include "GPU_shader.h" #include "DEG_depsgraph.h" |