diff options
| author | Antonioya <blendergit@gmail.com> | 2019-03-02 15:58:59 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2019-03-02 15:59:18 +0300 |
| commit | cd9c1c10e88c3fd1a028cdf2a711b4df234fbf17 (patch) | |
| tree | 76a0e2cd49b639e16dc93d15c9ffb07f8b27dded /source/blender/draw/engines/gpencil/gpencil_shader_fx.c | |
| parent | 10d41e48b8abd6f60f3dc379a8a0b5b5eb4889b4 (diff) | |
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.
Diffstat (limited to 'source/blender/draw/engines/gpencil/gpencil_shader_fx.c')
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_shader_fx.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |