diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-28 18:41:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-28 18:42:35 +0300 |
| commit | 4e8c5f4bc8c77d70328797ea179bb1c7ca0e51e2 (patch) | |
| tree | 0d2e2e22ed7512169e5bad7d0049003f60938d97 /intern/cycles/render/nodes.cpp | |
| parent | d44aebd3fe6e706c0c9d7938ed6f695163f268b8 (diff) | |
Fix Cycles OSL assert when running tests
Diffstat (limited to 'intern/cycles/render/nodes.cpp')
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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); |