From fd1bc90679a89a29172683939827be9c565e2217 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Sun, 18 Sep 2022 17:32:53 +0200
Subject: Cycles: sync changes from standalone repository

* Windows build fixes
* Workaround for Hydra + OpenColorIO link issue
* Bump version
---
 intern/cycles/scene/shader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'intern/cycles/scene/shader.cpp')

diff --git a/intern/cycles/scene/shader.cpp b/intern/cycles/scene/shader.cpp
index 96a8f40bbad..56670c6e4e3 100644
--- a/intern/cycles/scene/shader.cpp
+++ b/intern/cycles/scene/shader.cpp
@@ -780,7 +780,7 @@ static bool to_scene_linear_transform(OCIO::ConstConfigRcPtr &config,
 {
   OCIO::ConstProcessorRcPtr processor;
   try {
-    processor = config->getProcessor(OCIO::ROLE_SCENE_LINEAR, colorspace);
+    processor = config->getProcessor("scene_linear", colorspace);
   }
   catch (OCIO::Exception &) {
     return false;
@@ -834,7 +834,7 @@ void ShaderManager::init_xyz_transforms()
 #ifdef WITH_OCIO
   /* Get from OpenColorO config if it has the required roles. */
   OCIO::ConstConfigRcPtr config = OCIO::GetCurrentConfig();
-  if (!(config && config->hasRole(OCIO::ROLE_SCENE_LINEAR))) {
+  if (!(config && config->hasRole("scene_linear"))) {
     return;
   }
 
-- 
cgit v1.2.3