[Bf-blender-cvs] [d16e4d077df] master: Fix T61028: Crash when entering wireframe view

Clément Foucault noreply at git.blender.org
Thu Jan 31 01:35:13 CET 2019


Commit: d16e4d077dfe4ac887b51075784170911d3adca5
Author: Clément Foucault
Date:   Thu Jan 31 01:33:59 2019 +0100
Branches: master
https://developer.blender.org/rBd16e4d077dfe4ac887b51075784170911d3adca5

Fix T61028: Crash when entering wireframe view

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

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 413ab367d83..32cd10f027e 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -303,14 +303,11 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata)
 	float light_direction[3];
 	workbench_private_data_get_light_direction(wpd, light_direction);
 
-	if (!e_data.next_object_id) {
-		e_data.next_object_id = 1;
-
+	if (!e_data.checker_depth_sh) {
 		workbench_forward_outline_shaders_ensure(wpd);
 
 		e_data.checker_depth_sh = DRW_shader_create_fullscreen(
 		        datatoc_workbench_checkerboard_depth_frag_glsl, NULL);
-
 	}
 	workbench_volume_engine_init();
 	workbench_fxaa_engine_init();



More information about the Bf-blender-cvs mailing list