[Bf-blender-cvs] [4e8c5f4bc8c] master: Fix Cycles OSL assert when running tests

[Brecht Van Lommel]

Commit: 4e8c5f4bc8c77d70328797ea179bb1c7ca0e51e2
Author: Brecht Van Lommel
Date:   Fri Jun 28 17:41:59 2019 +0200
Branches: master
https://developer.blender.org/rB4e8c5f4bc8c77d70328797ea179bb1c7ca0e51e2

Fix Cycles OSL assert when running tests

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

M	intern/cycles/render/nodes.cpp

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

diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index c5b0f6a1e79..757aa8048b0 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -395,7 +395,8 @@ void ImageTextureNode::compile(OSLCompiler &compiler)
   }
 
   if (slot == -1) {
-    compiler.parameter_texture("filename", filename, known_colorspace);
+    compiler.parameter_texture(
+        "filename", filename, compress_as_srgb ? known_colorspace : u_colorspace_raw);
   }
   else {
     compiler.parameter_texture("filename", slot);
@@ -582,7 +583,8 @@ void EnvironmentTextureNode::compile(OSLCompiler &compiler)
   }
 
   if (slot == -1) {
-    compiler.parameter_texture("filename", filename, known_colorspace);
+    compiler.parameter_texture(
+        "filename", filename, compress_as_srgb ? known_colorspace : u_colorspace_raw);
   }
   else {
     compiler.parameter_texture("filename", slot);