[Bf-blender-cvs] [a8e459e452f] blender2.8: Fix T58360 "Use object as pivot" in GP "Shadow effect" crashes Blender

[Antonioya]

Commit: a8e459e452f7b7c42de8c4719125b69bfd1c7f32
Author: Antonioya
Date:   Fri Dec 7 20:01:01 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBa8e459e452f7b7c42de8c4719125b69bfd1c7f32

Fix T58360 "Use object as pivot" in GP "Shadow effect" crashes Blender

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

M	source/blender/draw/engines/gpencil/gpencil_shader_fx.c
M	source/blender/shader_fx/intern/FX_shader_shadow.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
index fcadf296253..673b47ff052 100644
--- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
+++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
@@ -443,6 +443,9 @@ static void DRW_gpencil_fx_shadow(
 	}
 	ShadowShaderFxData *fxd = (ShadowShaderFxData *)fx;
 	if ((!fxd->object) && (fxd->flag & FX_SHADOW_USE_OBJECT)) {
+		fxd->runtime.fx_sh = NULL;
+		fxd->runtime.fx_sh_b = NULL;
+		fxd->runtime.fx_sh_c = NULL;
 		return;
 	}
 
diff --git a/source/blender/shader_fx/intern/FX_shader_shadow.c b/source/blender/shader_fx/intern/FX_shader_shadow.c
index e3a9543fcb4..ba1bd4fe907 100644
--- a/source/blender/shader_fx/intern/FX_shader_shadow.c
+++ b/source/blender/shader_fx/intern/FX_shader_shadow.c
@@ -61,6 +61,8 @@ static void initData(ShaderFxData *md)
 
 	ARRAY_SET_ITEMS(gpfx->blur, 5, 5);
 	gpfx->samples = 2;
+
+	gpfx->object = NULL;
 }
 
 static void copyData(const ShaderFxData *md, ShaderFxData *target)