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/blenkernel | |
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/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_colortools.h | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/colortools.c | 17 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 3 |
3 files changed, 17 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h index 49508fee05c..15015eb85e0 100644 --- a/source/blender/blenkernel/BKE_colortools.h +++ b/source/blender/blenkernel/BKE_colortools.h @@ -94,10 +94,12 @@ void BKE_color_managed_display_settings_copy( const struct ColorManagedDisplaySettings *settings); /* Initialize view settings to be best suitable for render type of viewing. - * This will use default view transform from the OCIO configuration. */ + * This will use default view transform from the OCIO configuration if none + * is specified. */ void BKE_color_managed_view_settings_init_render( struct ColorManagedViewSettings *settings, - const struct ColorManagedDisplaySettings *display_settings); + const struct ColorManagedDisplaySettings *display_settings, + const char *view_transform); /* Initialize view settings which are best suitable for viewing non-render * images. For example,s movie clips while tracking. */ diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c index 8f05634322a..487468b1c61 100644 --- a/source/blender/blenkernel/intern/colortools.c +++ b/source/blender/blenkernel/intern/colortools.c @@ -1574,23 +1574,28 @@ void BKE_color_managed_display_settings_copy(ColorManagedDisplaySettings *new_se void BKE_color_managed_view_settings_init_render( ColorManagedViewSettings *view_settings, - const ColorManagedDisplaySettings *display_settings) + const ColorManagedDisplaySettings *display_settings, + const char *view_transform) { struct ColorManagedDisplay *display = IMB_colormanagement_display_get_named( display_settings->display_device); - BLI_strncpy( - view_settings->view_transform, - IMB_colormanagement_display_get_default_view_transform_name(display), - sizeof(view_settings->view_transform)); + + if (!view_transform) { + view_transform = IMB_colormanagement_display_get_default_view_transform_name(display); + } + /* TODO(sergey): Find a way to make look query more reliable with non * default configuration. */ - BLI_strncpy(view_settings->look, "None", sizeof(view_settings->look)); + STRNCPY(view_settings->view_transform, view_transform); + STRNCPY(view_settings->look, "None"); view_settings->flag = 0; view_settings->gamma = 1.0f; view_settings->exposure = 0.0f; view_settings->curve_mapping = NULL; + + IMB_colormanagement_validate_settings(display_settings, view_settings); } void BKE_color_managed_view_settings_init_default( diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 618b2f94812..9c7a911e478 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -773,7 +773,8 @@ void BKE_scene_init(Scene *sce) BKE_color_managed_display_settings_init(&sce->display_settings); BKE_color_managed_view_settings_init_render(&sce->view_settings, - &sce->display_settings); + &sce->display_settings, + "Filmic"); BLI_strncpy(sce->sequencer_colorspace_settings.name, colorspace_name, sizeof(sce->sequencer_colorspace_settings.name)); |