diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-09-18 18:32:53 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-09-18 18:34:23 +0300 |
| commit | fd1bc90679a89a29172683939827be9c565e2217 (patch) | |
| tree | 02d4bc3389f29df59b3a32e5842cb14556a6e8fc /intern/cycles/scene/shader.cpp | |
| parent | 0ffd288fab5686f55d68d0d39baf59568f4389e7 (diff) | |
Cycles: sync changes from standalone repository
* Windows build fixes
* Workaround for Hydra + OpenColorIO link issue
* Bump version
Diffstat (limited to 'intern/cycles/scene/shader.cpp')
| -rw-r--r-- | intern/cycles/scene/shader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |