Skip to content

feat: SG-35309: Set and save OCIO environment variable if missing and config is chosen #1263

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
deltag0 wants to merge 12 commits into
base: main
Choose a base branch
from
+11 −6
Open

feat: SG-35309: Set and save OCIO environment variable if missing and config is chosen #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c0aab09
remove logs
deltag0 May 7, 2026
77ffaa4
remove log output for any OCIO active display with no env variable
deltag0 May 7, 2026
f175370
use specified config instead of silent failure
deltag0 May 12, 2026
8887a79
format fix
deltag0 May 12, 2026
d77d078
save OCIO in settings
deltag0 May 12, 2026
4f42ab7
format fix
deltag0 May 12, 2026
253039c
menu UI update
deltag0 May 13, 2026
c62e68f
ordering change
deltag0 May 13, 2026
11928d6
format fix
deltag0 May 13, 2026
f14accf
comment for documentation
deltag0 May 13, 2026
53e9865
OCIO config file check update
deltag0 May 19, 2026
84c8b1e
setting env variable fix
deltag0 May 22, 2026
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
7 changes: 1 addition & 6 deletions src/lib/ip/OCIONodes/OCIOIPNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,16 +216,11 @@ namespace IPCore
{
m_state->linear = "";
}
else if (getenv("OCIO"))
else
{
OCIO::ConstColorSpaceRcPtr linearColorSpace = m_state->config->getColorSpace(OCIO::ROLE_SCENE_LINEAR);
m_state->linear = linearColorSpace ? linearColorSpace->getName() : "";
}
else
{
m_state->linear = "";
std::cerr << "ERROR: OCIO environment variable not set" << std::endl;
}

m_state->shaderID = "";

Expand Down
10 changes: 10 additions & 0 deletions src/plugins/rv-packages/ocio_source_setup/ocio_source_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@ def selectConfig(self, event):
self.config = OCIO.Config.CreateFromFile(config)
OCIO.SetCurrentConfig(self.config)
commands.defineModeMenu("OCIO Source Setup", self.buildOCIOMenu(), True)
commands.writeSettings("ocio_source_setup", "ocio_config", config)
except Exception as inst:
print(inst)

Expand Down Expand Up @@ -685,6 +686,8 @@ def addMenu(root, isSingle):
("Displays", None, None, lambda: commands.DisabledMenuState),
]
final += daList
final += [("_", None)]
final += [("Change Config...", self.selectConfig, None, None)]

return [("OCIO", final)]

Expand Down Expand Up @@ -716,6 +719,13 @@ def __init__(self):
except ImportError:
pass

# Restore saved OCIO config from previously loaded config
# An externally set OCIO env var takes precendence
if os.getenv("OCIO") is None:
Comment thread
bernie-laberge marked this conversation as resolved.
config = commands.readSettings("ocio_source_setup", "ocio_config", "")
if config != "" and os.path.isfile(config):
self.config = OCIO.Config.CreateFromFile(config)

self.init(
"OCIO Source Setup",
None,
Expand Down