[Bf-blender-cvs] [24edd498182] master: Fix T63312: Crash XRay + clipping

Jeroen Bakker noreply at git.blender.org
Tue Apr 16 17:02:38 CEST 2019


Commit: 24edd498182d28552f89f9b7adeaff7db3647948
Author: Jeroen Bakker
Date:   Mon Apr 8 08:12:45 2019 +0200
Branches: master
https://developer.blender.org/rB24edd498182d28552f89f9b7adeaff7db3647948

Fix T63312: Crash XRay + clipping

Outline shaders were only selected when no checker depth was available.

Reviewed By: fclem

Maniphest Tasks: T63312

Differential Revision: https://developer.blender.org/D4661

===================================================================

M	source/blender/draw/engines/workbench/workbench_forward.c

===================================================================

diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c
index fe8a341bf3e..f86a263406a 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -318,6 +318,7 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata)
 	workbench_fxaa_engine_init();
 	workbench_taa_engine_init(vedata);
 
+	workbench_forward_outline_shaders_ensure(wpd, draw_ctx->sh_cfg);
 	workbench_forward_choose_shaders(wpd, draw_ctx->sh_cfg);
 
 	const float *viewport_size = DRW_viewport_size_get();



More information about the Bf-blender-cvs mailing list