diff options
author | Jeroen Bakker <jeroen@blender.org> | 2020-09-15 15:33:22 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2020-09-15 15:33:22 +0300 |
commit | 8f7ab269355bf9d15ad5b405017c1a7eb486d64f (patch) | |
tree | 9caac6d02b75e67530a5642985ed3d924f10a0e4 /source/blender/draw/engines/image/shaders | |
parent | 78ea6302f1c45992dd1166cc3978a2ba4201d638 (diff) |
Revert "Image Editor: Make Rendering of Pure Emissive Colors Optional"
This reverts commit f492c8d488b7eb2166ca894e10a8128a1678a885.
Diffstat (limited to 'source/blender/draw/engines/image/shaders')
-rw-r--r-- | source/blender/draw/engines/image/shaders/engine_image_frag.glsl | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/source/blender/draw/engines/image/shaders/engine_image_frag.glsl b/source/blender/draw/engines/image/shaders/engine_image_frag.glsl index f6a3e1affb9..bbff06845a8 100644 --- a/source/blender/draw/engines/image/shaders/engine_image_frag.glsl +++ b/source/blender/draw/engines/image/shaders/engine_image_frag.glsl @@ -6,7 +6,6 @@ #define SIMA_DRAW_FLAG_SHUFFLING (1 << 2) #define SIMA_DRAW_FLAG_DEPTH (1 << 3) #define SIMA_DRAW_FLAG_DO_REPEAT (1 << 4) -#define SIMA_DRAW_FLAG_PURE_EMISSIVE (1 << 5) #ifdef TILED_IMAGE uniform sampler2DArray imageTileArray; @@ -75,12 +74,6 @@ void main() tex_color = texture(imageTexture, uvs_clamped); #endif - if ((drawFlags & SIMA_DRAW_FLAG_PURE_EMISSIVE) == 0) { - if (imgPremultiplied && tex_color.a == 0.0) { - tex_color.rgb = vec3(0.0); - } - } - if ((drawFlags & SIMA_DRAW_FLAG_APPLY_ALPHA) != 0) { if (!imgPremultiplied) { tex_color.rgb *= tex_color.a; |