From cd9c1c10e88c3fd1a028cdf2a711b4df234fbf17 Mon Sep 17 00:00:00 2001 From: Antonioya Date: Sat, 2 Mar 2019 13:58:59 +0100 Subject: GPencil: Fix Display Textures in Solid mode There was a bug when selected Solid mode with Material or Texture mode. The textures were not visible. Now, the mode is passed to shaders to decide if use the solid color or the result texture color. The mode is passed using an array with shading type and mode. --- source/blender/draw/engines/gpencil/gpencil_shader_fx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/draw/engines/gpencil/gpencil_shader_fx.c') diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c index 4b03075abc3..e4819f48eb1 100644 --- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c +++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c @@ -746,7 +746,7 @@ void DRW_gpencil_fx_prepare( tGPencilObjectCache *cache_ob) { GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl; - const bool wiremode = (bool)(cache_ob->shading_type == OB_WIRE); + const bool wiremode = (bool)(cache_ob->shading_type[0] == OB_WIRE); int ob_idx = cache_ob->idx; -- cgit v1.2.3