diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-03-28 16:58:37 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-03-28 16:59:00 +0300 |
| commit | aa0c864d4878a2483775d766c87fb41491138d10 (patch) | |
| tree | 7fa54c2dfb2d04fefa50733c980563ded23d4da5 /source/blender/draw/engines/workbench/workbench_private.h | |
| parent | fe9c9a313fbb78ba9987c9978d52e22bc33b30f2 (diff) | |
Fix T62874: Crash Texture shading+Transparency
When texure shading is enabled, the transparency accum shaders were not set/updated.
This resulted into a crash when transparent objects were rendered when shading mode
was set to texture.
This patch will add the V3D_SHADING_TEXTURE_COLOR to the modes for OIT so the
shaders are set.
Reviewed By: fclem
Maniphest Tasks: T62874
Differential Revision: https://developer.blender.org/D4592
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 39232564ccd..75d72933c8e 100644 --- a/source/blender/draw/engines/workbench/workbench_private.h +++ b/source/blender/draw/engines/workbench/workbench_private.h @@ -56,7 +56,7 @@ #define SHADOW_ENABLED(wpd) (wpd->shading.flag & V3D_SHADING_SHADOW) #define GHOST_ENABLED(psl) (!DRW_pass_is_empty(psl->ghost_prepass_pass) || !DRW_pass_is_empty(psl->ghost_prepass_hair_pass)) #define CULL_BACKFACE_ENABLED(wpd) ((wpd->shading.flag & V3D_SHADING_BACKFACE_CULLING) != 0) -#define OIT_ENABLED(wpd) (ELEM(wpd->shading.color_type, V3D_SHADING_MATERIAL_COLOR, V3D_SHADING_OBJECT_COLOR)) +#define OIT_ENABLED(wpd) (ELEM(wpd->shading.color_type, V3D_SHADING_MATERIAL_COLOR, V3D_SHADING_OBJECT_COLOR, V3D_SHADING_TEXTURE_COLOR)) #define IS_NAVIGATING(wpd) ((DRW_context_state_get()->rv3d) && (DRW_context_state_get()->rv3d->rflag & RV3D_NAVIGATING)) #define FXAA_ENABLED(wpd) ((!DRW_state_is_opengl_render()) && \ |