From 4e8c5f4bc8c77d70328797ea179bb1c7ca0e51e2 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 28 Jun 2019 17:41:59 +0200 Subject: Fix Cycles OSL assert when running tests --- intern/cycles/render/nodes.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to '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); -- cgit v1.2.3