Skip to content

Commit

Permalink
Fixed OCIO which got broken in v0.7.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
ggarra13 committed Aug 10, 2023
1 parent 4f1eb3e commit 3ffcedc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions mrv2/lib/mrvGL/mrvTimelineViewport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1447,6 +1447,7 @@ namespace mrv
input = "";

timeline::ColorConfigOptions o;
o.enabled = true;
o.fileName = p.ui->uiPrefs->uiPrefsOCIOConfig->value();
o.input = input;

Expand Down
5 changes: 3 additions & 2 deletions mrv2/lib/mrvPy/USD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,12 @@ Contains all classes and enums related to USD (Universal Scene Description).
.doc() = _("USD Render Options.");

usd.def(
"renderOptions", &mrv::usd::renderOptions, _("Get Render Options."));
"renderOptions", &mrv::usd::renderOptions,
_("Get USD Render Options."));

usd.def(
"setRenderOptions", &mrv::usd::setRenderOptions,
_("Set Render Options."), py::arg("renderOptions"));
_("Set USD Render Options."), py::arg("renderOptions"));
}

#endif

0 comments on commit 3ffcedc

Please sign in to comment.