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:
authorClément Foucault <foucault.clem@gmail.com>2018-09-27 17:09:04 +0300
committerClément Foucault <foucault.clem@gmail.com>2018-09-27 17:09:27 +0300
commita3fea397244406e2f60c388ea651a200e5b3681c (patch)
tree2c6bef70ed627ac23e06496503d284d209b2b9a3 /source/blender/editors/space_view3d/view3d_view.c
parentefc4862ee69ca9565c1176c59628e023cdea17d0 (diff)
Fix T56915: Selectability in Solid Xray Mode
This was caused by the object center being selected by the wireframe pass. The wireframe pass is now only drawn if we search for the nearest surface. This makes all wire objects (like non-meshes objects) higher priority than mesh surfaces.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_view.c')
-rw-r--r--source/blender/editors/space_view3d/view3d_view.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index ca4fe0ad67b..67cbc1e99b9 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -1009,7 +1009,7 @@ int view3d_opengl_select(
}
/* If in xray mode, we select the wires in priority. */
- if (v3d->shading.flag & V3D_XRAY_FLAG(v3d)) {
+ if ((v3d->shading.flag & V3D_XRAY_FLAG(v3d)) && use_nearest) {
/* We need to call "GPU_select_*" API's inside DRW_draw_select_loop
* because the OpenGL context created & destroyed inside this function. */
struct DrawSelectLoopUserData drw_select_loop_user_data = {