From 3ffcedceab633817217894a35bb2446cd4bd7aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Thu, 10 Aug 2023 15:05:20 -0300 Subject: [PATCH] Fixed OCIO which got broken in v0.7.0. --- mrv2/lib/mrvGL/mrvTimelineViewport.cpp | 1 + mrv2/lib/mrvPy/USD.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mrv2/lib/mrvGL/mrvTimelineViewport.cpp b/mrv2/lib/mrvGL/mrvTimelineViewport.cpp index c6624c88c..8a00e6e37 100644 --- a/mrv2/lib/mrvGL/mrvTimelineViewport.cpp +++ b/mrv2/lib/mrvGL/mrvTimelineViewport.cpp @@ -1447,6 +1447,7 @@ namespace mrv input = ""; timeline::ColorConfigOptions o; + o.enabled = true; o.fileName = p.ui->uiPrefs->uiPrefsOCIOConfig->value(); o.input = input; diff --git a/mrv2/lib/mrvPy/USD.cpp b/mrv2/lib/mrvPy/USD.cpp index 0d35cf280..065419c14 100644 --- a/mrv2/lib/mrvPy/USD.cpp +++ b/mrv2/lib/mrvPy/USD.cpp @@ -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