From 6ccebcd988583bedf435a18912b0257bd046d59f Mon Sep 17 00:00:00 2001 From: Thomas Wilshaw Date: Wed, 9 Mar 2022 12:50:34 +0000 Subject: [PATCH] colormanager: Remove hard coded color space The hard coded color space was causing custom configs to crash if they didn't contain that specific color space. Also sets the default role in the config to sRGB EOTF to keep consistency with previous behaviour --- app/node/color/colormanager/colormanager.cpp | 2 +- app/render/ocioconf/config.ocio | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/node/color/colormanager/colormanager.cpp b/app/node/color/colormanager/colormanager.cpp index 956a8721a..4f946a513 100644 --- a/app/node/color/colormanager/colormanager.cpp +++ b/app/node/color/colormanager/colormanager.cpp @@ -50,7 +50,7 @@ ColorManager::ColorManager() : // Set config to our built-in default SetConfig(GetDefaultConfig()); - SetDefaultInputColorSpace(QStringLiteral("sRGB OETF")); + SetDefaultInputColorSpace(config_->getCanonicalName(OCIO::ROLE_DEFAULT)); } OCIO::ConstConfigRcPtr ColorManager::GetConfig() const diff --git a/app/render/ocioconf/config.ocio b/app/render/ocioconf/config.ocio index bb5d3069a..0253fb63b 100755 --- a/app/render/ocioconf/config.ocio +++ b/app/render/ocioconf/config.ocio @@ -16,7 +16,7 @@ luma: [0.2126, 0.7152, 0.0722] description: A filmlike dynamic range encoding set for Blender roles: - default: Linear + default: sRGB OETF reference: Linear scene_linear: Linear data: Non-Colour Data