Skip to content

Fixes SYNDisplay property regression #1080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
williamwira wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixes SYNDisplay property regression #1080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/lib/ip/OCIONodes/OCIOIPNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ namespace IPCore
}
}

updateConfig();
updateConfig(true);
}

OCIOIPNode::~OCIOIPNode()
Expand All @@ -174,7 +174,7 @@ namespace IPCore
delete m_state;
}

void OCIOIPNode::updateConfig()
void OCIOIPNode::updateConfig(const bool initializing)
{
try
{
Expand Down Expand Up @@ -230,7 +230,10 @@ namespace IPCore
m_state->shaderID = "";

updateContext();
updateFunction();
if (!initializing)
{
updateFunction();
}
}

void OCIOIPNode::updateContext()
Expand Down Expand Up @@ -352,7 +355,7 @@ namespace IPCore
boost::hash<string> string_hash;
string inName = stringProp("ocio.inColorSpace", m_state->linear);

if (inName.empty())
if (inName.empty() && !useRawConfig())
return;

try
Expand Down
2 changes: 1 addition & 1 deletion src/lib/ip/OCIONodes/OCIONodes/OCIOIPNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ namespace IPCore
virtual void readCompleted(const std::string&, unsigned int);
virtual void propertyChanged(const Property*);

void updateConfig();
void updateConfig(const bool initializing = false);

bool useRawConfig() const { return m_useRawConfig; }

Expand Down
Loading