Commit: 915e54ee9db0894d9689cbef235b321885b04e62 Author: Clément Foucault Date: Sun Dec 1 12:30:17 2019 +0100 Branches: tmp-overlay-engine https://developer.blender.org/rB915e54ee9db0894d9689cbef235b321885b04e62
Overlay Engine: Fix Sculpt Mask overlay =================================================================== M source/blender/draw/engines/overlay/overlay_sculpt.c M source/blender/draw/engines/overlay/shaders/sculpt_mask_vert.glsl =================================================================== diff --git a/source/blender/draw/engines/overlay/overlay_sculpt.c b/source/blender/draw/engines/overlay/overlay_sculpt.c index 1cba8b68830..3b7f12ed804 100644 --- a/source/blender/draw/engines/overlay/overlay_sculpt.c +++ b/source/blender/draw/engines/overlay/overlay_sculpt.c @@ -34,7 +34,7 @@ void OVERLAY_sculpt_cache_init(OVERLAY_Data *vedata) OVERLAY_PrivateData *pd = vedata->stl->pd; DRWShadingGroup *grp; - DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | DRW_STATE_BLEND_MUL; + DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | DRW_STATE_BLEND_ALPHA; DRW_PASS_CREATE(psl->sculpt_mask_ps, state | pd->clipping_state); GPUShader *sh = OVERLAY_shader_sculpt_mask(); diff --git a/source/blender/draw/engines/overlay/shaders/sculpt_mask_vert.glsl b/source/blender/draw/engines/overlay/shaders/sculpt_mask_vert.glsl index 4f64cfc673e..18a096da61b 100644 --- a/source/blender/draw/engines/overlay/shaders/sculpt_mask_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/sculpt_mask_vert.glsl @@ -12,7 +12,7 @@ void main() gl_Position = point_world_to_ndc(world_pos); float mask = 1.0 - (msk * maskOpacity); - finalColor = vec4(mask, mask, mask, 1.0); + finalColor = vec4(0.0, 0.0, 0.0, mask); #ifdef USE_WORLD_CLIP_PLANES world_clip_planes_calc_clip_distance(world_pos); _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
