Viewport: use Filmic without scene exposure/gamma/curves for workbench.

This ignores the scene color managment view settings for solid mode and
lookdev when not using scene lights and world. The scene settings are
intended for tweaking renders and should not affect studio lighting and
matcaps.

There may be cases where a simple sRGB transform is better than Filmic
and we could add configuration for this. Not sure if it really matters
and it may be better if we just assume matcaps and studiolights are all
created for one view transform.

Differential Revision: https://developer.blender.org/D3569

1 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/draw/engines/workbench/workbench_effect_aa.c b/source/blender/draw/engines/workbench/workbench_effect_aa.c
index 6269496f568..deb9a517f96 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_aa.c
+++ b/source/blender/draw/engines/workbench/workbench_effect_aa.c
@@ -56,7 +56,7 @@ void workbench_aa_create_pass(WORKBENCH_Data *vedata, GPUTexture **tx)
 	}
 }
 
-static void workspace_aa_draw_transform(GPUTexture *tx)
+static void workspace_aa_draw_transform(GPUTexture *tx, WORKBENCH_PrivateData *wpd)
 {
 	if (DRW_state_is_image_render()) {
 		/* Linear result for render. */
@@ -64,7 +64,7 @@ static void workspace_aa_draw_transform(GPUTexture *tx)
 	}
 	else {
 		/* Display space result for viewport. */
-		DRW_transform_to_display(tx);
+		DRW_transform_to_display(tx, wpd->use_color_view_settings);
 	}
 }
 
@@ -79,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);
-		workspace_aa_draw_transform(tx);
+		workspace_aa_draw_transform(tx, wpd);
 		GPU_framebuffer_bind(dfbl->color_only_fb);
 		DRW_draw_pass(psl->effect_aa_pass);
 	}
@@ -92,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);
-			workspace_aa_draw_transform(tx);
+			workspace_aa_draw_transform(tx, wpd);
 		}
 		else {
 			GPU_framebuffer_bind(fbl->effect_fb);
-			workspace_aa_draw_transform(tx);
+			workspace_aa_draw_transform(tx, wpd);
 			GPU_framebuffer_bind(dfbl->color_only_fb);
 			DRW_draw_pass(psl->effect_aa_pass);
 		}
@@ -104,6 +104,6 @@ void workbench_aa_draw_pass(WORKBENCH_Data *vedata, GPUTexture *tx)
 	}
 	else {
 		GPU_framebuffer_bind(dfbl->color_only_fb);
-		workspace_aa_draw_transform(tx);
+		workspace_aa_draw_transform(tx, wpd);
 	}
 }