oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
itsmattkc
2020-04-18 17:55:23 +10:00
parent d3b71e6576
commit 707e9d5522
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/dialog/projectproperties/projectproperties.cpp
+2 -6
View File
@@ -92,14 +92,10 @@ ProjectPropertiesDialog::ProjectPropertiesDialog(Project* p, QWidget *parent) :
void ProjectPropertiesDialog::accept()
{
try {
OCIO::ConstConfigRcPtr config = OCIO::Config::CreateFromFile(ocio_filename_->text().toUtf8());
working_project_->set_default_input_colorspace(default_input_colorspace_->currentText());
// This should ripple changes throughout the program that the color config has changed, therefore must be done last
working_project_->set_ocio_config(ocio_filename_->text());
// This should ripple changes throughout the program that the color config has changed, therefore must be done last
working_project_->color_manager()->SetConfig(config);
working_project_->set_default_input_colorspace(default_input_colorspace_->currentText());
QDialog::accept();
} catch (OCIO::Exception& e) {
app/project/project.cpp
+2
View File
@@ -135,6 +135,8 @@ const QString &Project::ocio_config() const
void Project::set_ocio_config(const QString &ocio_config)
{
color_manager_.SetConfig(ocio_config);
ocio_config_ = ocio_config;
}
app/render/colormanager.cpp
+9 -1
View File
@@ -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)