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>2020-04-27 21:05:42 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-04-27 21:05:42 +0300
commita1b1f2acd433e7e76cbb6111a6688277f7c1feaf (patch)
treee0adf6c91d085e37a022e81dbe72cf2f60ab8105 /source/blender/draw/engines/overlay/overlay_paint.c
parentaf876b12f1f7925228a568d7ae1f412babf08114 (diff)
Workbench: Fix weight paint overlay and wireframe for infront object
This fix case where you have wireframe on top of infront objects but workbench AA conflicts and they appear to not be occluded. Also T74923 is still fixed but we extend the fix to not mess the case when using a mode that does not support infront.
Diffstat (limited to 'source/blender/draw/engines/overlay/overlay_paint.c')
-rw-r--r--source/blender/draw/engines/overlay/overlay_paint.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_paint.c b/source/blender/draw/engines/overlay/overlay_paint.c
index ccb309fdc4c..456c56f9c03 100644
--- a/source/blender/draw/engines/overlay/overlay_paint.c
+++ b/source/blender/draw/engines/overlay/overlay_paint.c
@@ -62,7 +62,8 @@ void OVERLAY_paint_init(OVERLAY_Data *vedata)
OVERLAY_PrivateData *pd = stl->pd;
const DRWContextState *draw_ctx = DRW_context_state_get();
- pd->painting.in_front = draw_ctx->obact && (draw_ctx->obact->dtx & OB_DRAWXRAY);
+ pd->painting.in_front = pd->use_in_front && draw_ctx->obact &&
+ (draw_ctx->obact->dtx & OB_DRAWXRAY);
pd->painting.alpha_blending = paint_object_is_rendered_transparent(draw_ctx->v3d,
draw_ctx->obact);
}