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 | |
parent | 78ea6302f1c45992dd1166cc3978a2ba4201d638 (diff) |
Revert "Image Editor: Make Rendering of Pure Emissive Colors Optional"
This reverts commit f492c8d488b7eb2166ca894e10a8128a1678a885.
Diffstat (limited to 'source/blender/draw/engines')
-rw-r--r-- | source/blender/draw/engines/image/image_engine.c | 3 | ||||
-rw-r--r-- | source/blender/draw/engines/image/shaders/engine_image_frag.glsl | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/source/blender/draw/engines/image/image_engine.c b/source/blender/draw/engines/image/image_engine.c index 99c812859c1..90bfb38dadf 100644 --- a/source/blender/draw/engines/image/image_engine.c +++ b/source/blender/draw/engines/image/image_engine.c @@ -43,7 +43,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) static void image_cache_image_add(DRWShadingGroup *grp, Image *image) { @@ -143,7 +142,6 @@ static void image_cache_image(IMAGE_Data *vedata, Image *image, ImageUser *iuser const bool is_tiled_texture = tex_tile_data != NULL; const bool do_repeat = (!is_tiled_texture) && ((sima->flag & SI_DRAW_TILE) != 0); const bool is_zoom_out = sima->zoom < 1.0f; - const bool show_pure_emissive_colors = (sima->flag & SI_SHOW_PURE_EMISSIVE) != 0; /* use interpolation filtering when zooming out */ eGPUSamplerState state = 0; @@ -151,7 +149,6 @@ static void image_cache_image(IMAGE_Data *vedata, Image *image, ImageUser *iuser int draw_flags = 0; SET_FLAG_FROM_TEST(draw_flags, do_repeat, SIMA_DRAW_FLAG_DO_REPEAT); - SET_FLAG_FROM_TEST(draw_flags, show_pure_emissive_colors, SIMA_DRAW_FLAG_PURE_EMISSIVE); if ((sima->flag & SI_USE_ALPHA) != 0) { /* Show RGBA */ 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; |