project: fixed bug where ocio config wouldn't automatically load from a saved project

2020-04-18 17:55:23 +10:00
parent d3b71e6576
commit 707e9d5522
3 changed files with 13 additions and 7 deletions
@@ -44,7 +44,15 @@ OCIO::ConstConfigRcPtr ColorManager::GetConfig() const

 void ColorManager::SetConfig(const QString &filename)
 {
-  SetConfig(OCIO::Config::CreateFromFile(filename.toUtf8()));
+  OCIO::ConstConfigRcPtr cfg;
+
+  if (filename.isEmpty()) {
+    cfg = OCIO::Config::CreateFromEnv();
+  } else {
+    cfg = OCIO::Config::CreateFromFile(filename.toUtf8());
+  }
+
+  SetConfig(cfg);
 }

 void ColorManager::SetConfig(OCIO::ConstConfigRcPtr config)