[Bf-blender-cvs] [7d29c9a16b8] blender2.8: Overlay: Fix crash when ghosting is enabled without wireframe

Clément Foucault noreply at git.blender.org
Fri Aug 17 00:00:25 CEST 2018


Commit: 7d29c9a16b815b51bdd7539bbef2332e2ce94ec4
Author: Clément Foucault
Date:   Thu Aug 16 23:51:15 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB7d29c9a16b815b51bdd7539bbef2332e2ce94ec4

Overlay: Fix crash when ghosting is enabled without wireframe

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

M	source/blender/draw/modes/overlay_mode.c

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

diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c
index fffbd60b5d4..e893aaa4038 100644
--- a/source/blender/draw/modes/overlay_mode.c
+++ b/source/blender/draw/modes/overlay_mode.c
@@ -223,8 +223,9 @@ static void overlay_cache_finish(void *vedata)
 
 	/* only in solid mode */
 	if (v3d->shading.type == OB_SOLID && (v3d->shading.flag & V3D_SHADING_XRAY) == 0) {
-		if (stl->g_data->ghost_stencil_test)
+		if (stl->g_data->ghost_stencil_test && (psl->face_wireframe_pass != NULL)) {
 			DRW_pass_state_add(psl->face_wireframe_pass, DRW_STATE_STENCIL_EQUAL);
+		}
 	}
 }



More information about the Bf-blender-cvs mailing list