From 16c44700e9397cafff1fa008efbde878f4d6f66f Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 17 Aug 2023 14:38:52 +0200 Subject: [PATCH] Color management: Validate look is compatible with view on load While currently the only way to reproduce the issue is to modify the default OCIO configuration, change the view (which does yet validate look on change) and save-reload, it seems to be a good thing to validate anyway, to be more future-proof. Pull Request: https://projects.blender.org/blender/blender/pulls/111209 --- source/blender/imbuf/intern/colormanagement.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/source/blender/imbuf/intern/colormanagement.cc b/source/blender/imbuf/intern/colormanagement.cc index 3b32add80fa..44ef8e13f60 100644 --- a/source/blender/imbuf/intern/colormanagement.cc +++ b/source/blender/imbuf/intern/colormanagement.cc @@ -1148,6 +1148,17 @@ static void colormanage_check_view_settings(ColorManagedDisplaySettings *display STRNCPY(view_settings->look, default_look_name); } + else if (!colormanage_compatible_look(look, view_settings->view_transform)) { + printf( + "Color management: %s look \"%s\" is not compatible with view \"%s\", setting default " + "\"%s\".\n", + what, + view_settings->look, + view_settings->view_transform, + default_look->name); + + STRNCPY(view_settings->look, default_look->name); + } } /* OCIO_TODO: move to do_versions() */