diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-01 22:30:10 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-01 22:56:42 +0300 |
commit | 9a63fa21eb45038ce747748156da61b14213d6c7 (patch) | |
tree | 7e954222ff84e0286fb922da991b2a51ed3c4c1d /source/blender/draw/engines/workbench | |
parent | 81fc55f563a909e4011bd4dc4c078ab292be3a17 (diff) |
Color management: change view transform for color pickers and display modes.
* Use simple default view transform for color pickers, as Filmic does not work
well for all types of colors. We better handle this with an option and tagging
of colors as emissive or albedo like.
* For solid/workbench we also no longer use Filmic, as there is not enough contrast
and it's not really needed since this is not physically based lighting.
* For lookdev always take into account the view transform and look. Other view
settings like exposure are only taken into account if scene lighting is used,
since these are often dependent on scene light intensity.
Fixes T61022, T57649, T59363.
Diffstat (limited to 'source/blender/draw/engines/workbench')
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_data.c b/source/blender/draw/engines/workbench/workbench_data.c index d3fde2dd26a..998b70831ea 100644 --- a/source/blender/draw/engines/workbench/workbench_data.c +++ b/source/blender/draw/engines/workbench/workbench_data.c @@ -42,17 +42,17 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd) View3D *v3d = draw_ctx->v3d; if (!v3d) { wpd->shading = scene->display.shading; - wpd->use_color_view_settings = true; + wpd->use_color_render_settings = true; } else if (v3d->shading.type == OB_RENDER && BKE_scene_uses_blender_workbench(scene)) { wpd->shading = scene->display.shading; - wpd->use_color_view_settings = true; + wpd->use_color_render_settings = true; } else { wpd->shading = v3d->shading; - wpd->use_color_view_settings = false; + wpd->use_color_render_settings = false; } if (wpd->shading.light == V3D_LIGHTING_MATCAP) { diff --git a/source/blender/draw/engines/workbench/workbench_effect_aa.c b/source/blender/draw/engines/workbench/workbench_effect_aa.c index 04907ea5523..27bec676836 100644 --- a/source/blender/draw/engines/workbench/workbench_effect_aa.c +++ b/source/blender/draw/engines/workbench/workbench_effect_aa.c @@ -61,7 +61,7 @@ static void workspace_aa_draw_transform(GPUTexture *tx, WORKBENCH_PrivateData *w } else { /* Display space result for viewport. */ - DRW_transform_to_display(tx, wpd->use_color_view_settings); + DRW_transform_to_display(tx, wpd->use_color_render_settings, wpd->use_color_render_settings); } } diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h index d203932bec5..2cd80d202f6 100644 --- a/source/blender/draw/engines/workbench/workbench_private.h +++ b/source/blender/draw/engines/workbench/workbench_private.h @@ -252,7 +252,7 @@ typedef struct WORKBENCH_PrivateData { bool dof_enabled; /* Color Management */ - bool use_color_view_settings; + bool use_color_render_settings; } WORKBENCH_PrivateData; /* Transient data */ typedef struct WORKBENCH_EffectInfo { |