diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-12-21 01:23:59 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-12-21 01:25:34 +0300 |
| commit | d7b7a6945ec1f4069322f01b283597a184f44a16 (patch) | |
| tree | 6c65cad2f1c26d23e6e0faa920f43b08183b1702 /source/blender/draw/engines/workbench/workbench_private.h | |
| parent | db410385b78a5e115395df1daf44feb401a5a4ef (diff) | |
Workbench: Fix wrong TEXTURE_DRAWING_ENABLED check and rework drawing logic
This makes the code easier to follow. Batches are now assumed to be not
NULL as the request system garatees it.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_private.h')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h index 080817c7f53..534fc3b933b 100644 --- a/source/blender/draw/engines/workbench/workbench_private.h +++ b/source/blender/draw/engines/workbench/workbench_private.h @@ -45,7 +45,7 @@ #define MAX_ACCUM_SHADERS (1 << 4) #define MAX_CAVITY_SHADERS (1 << 3) -#define TEXTURE_DRAWING_ENABLED(wpd) (wpd->shading.color_type & V3D_SHADING_TEXTURE_COLOR) +#define TEXTURE_DRAWING_ENABLED(wpd) (wpd->shading.color_type == V3D_SHADING_TEXTURE_COLOR) #define FLAT_ENABLED(wpd) (wpd->shading.light == V3D_LIGHTING_FLAT) #define STUDIOLIGHT_ENABLED(wpd) (wpd->shading.light == V3D_LIGHTING_STUDIO) #define MATCAP_ENABLED(wpd) (wpd->shading.light == V3D_LIGHTING_MATCAP) |