Merge branch 'master' into pr/1875

This commit is contained in:
itsmattkc
2022-04-15 13:24:23 -07:00
268 changed files with 73441 additions and 2576 deletions
+1 -1
View File
@@ -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