1 files changed, 27 insertions, 4 deletions

diff --git a/source/blender/draw/engines/workbench/workbench_effect_aa.c b/source/blender/draw/engines/workbench/workbench_effect_aa.c
index f1d5d5d6078..deb9a517f96 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_aa.c
+++ b/source/blender/draw/engines/workbench/workbench_effect_aa.c
@@ -23,6 +23,8 @@
  *  \ingroup draw_engine
  */
 
+#include "ED_screen.h"
+
 #include "workbench_private.h"
 
 
@@ -32,6 +34,15 @@ void workbench_aa_create_pass(WORKBENCH_Data *vedata, GPUTexture **tx)
 	WORKBENCH_PrivateData *wpd = stl->g_data;
 	WORKBENCH_PassList *psl = vedata->psl;
 	WORKBENCH_EffectInfo *effect_info = stl->effects;
+	const DRWContextState *draw_ctx = DRW_context_state_get();
+
+	if (draw_ctx->evil_C != NULL) {
+		struct wmWindowManager *wm = CTX_wm_manager(draw_ctx->evil_C);
+		wpd->is_playback = ED_screen_animation_playing(wm) != NULL;
+	}
+	else {
+		wpd->is_playback = false;
+	}
 
 	if (TAA_ENABLED(wpd)) {
 		psl->effect_aa_pass = workbench_taa_create_pass(vedata, tx);
@@ -45,6 +56,18 @@ void workbench_aa_create_pass(WORKBENCH_Data *vedata, GPUTexture **tx)
 	}
 }
 
+static void workspace_aa_draw_transform(GPUTexture *tx, WORKBENCH_PrivateData *wpd)
+{
+	if (DRW_state_is_image_render()) {
+		/* Linear result for render. */
+		DRW_transform_none(tx);
+	}
+	else {
+		/* Display space result for viewport. */
+		DRW_transform_to_display(tx, wpd->use_color_view_settings);
+	}
+}
+
 void workbench_aa_draw_pass(WORKBENCH_Data *vedata, GPUTexture *tx)
 {
 	WORKBENCH_StorageList *stl = vedata->stl;
@@ -56,7 +79,7 @@ void workbench_aa_draw_pass(WORKBENCH_Data *vedata, GPUTexture *tx)
 	DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
 	if (FXAA_ENABLED(wpd)) {
 		GPU_framebuffer_bind(fbl->effect_fb);
-		DRW_transform_to_display(tx);
+		workspace_aa_draw_transform(tx, wpd);
 		GPU_framebuffer_bind(dfbl->color_only_fb);
 		DRW_draw_pass(psl->effect_aa_pass);
 	}
@@ -69,11 +92,11 @@ void workbench_aa_draw_pass(WORKBENCH_Data *vedata, GPUTexture *tx)
 		 */
 		if (effect_info->jitter_index == 1) {
 			GPU_framebuffer_bind(dfbl->color_only_fb);
-			DRW_transform_to_display(tx);
+			workspace_aa_draw_transform(tx, wpd);
 		}
 		else {
 			GPU_framebuffer_bind(fbl->effect_fb);
-			DRW_transform_to_display(tx);
+			workspace_aa_draw_transform(tx, wpd);
 			GPU_framebuffer_bind(dfbl->color_only_fb);
 			DRW_draw_pass(psl->effect_aa_pass);
 		}
@@ -81,6 +104,6 @@ void workbench_aa_draw_pass(WORKBENCH_Data *vedata, GPUTexture *tx)
 	}
 	else {
 		GPU_framebuffer_bind(dfbl->color_only_fb);
-		DRW_transform_to_display(tx);
+		workspace_aa_draw_transform(tx, wpd);
 	}
 }