[Bf-blender-cvs] [351d8bfc41a] master: Fix T85694: Cycles incorrect grayscale conversion with some OpenColorIO configs

Brecht Van Lommel noreply at git.blender.org
Wed Feb 17 16:26:39 CET 2021


Commit: 351d8bfc41a7ab983a20a1843dec550c9b198a38
Author: Brecht Van Lommel
Date:   Wed Feb 17 06:13:49 2021 +0100
Branches: master
https://developer.blender.org/rB351d8bfc41a7ab983a20a1843dec550c9b198a38

Fix T85694: Cycles incorrect grayscale conversion with some OpenColorIO configs

===================================================================

M	intern/cycles/render/shader.cpp

===================================================================

diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 1b785fe9096..847f97fb2bf 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -873,6 +873,10 @@ void ShaderManager::init_xyz_transforms()
       return;
     }
   }
+  else {
+    /* No reference role found to determine XYZ. */
+    return;
+  }
 
   xyz_to_r = float4_to_float3(xyz_to_rgb.x);
   xyz_to_g = float4_to_float3(xyz_to_rgb.y);



More information about the Bf-blender-cvs mailing list