Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Cycles OSL assert when running tests

Browse Source
This commit is contained in:
Brecht Van Lommel
2019-06-28 17:41:59 +02:00
parent d44aebd3fe
commit 4e8c5f4bc8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/render/nodes.cpp
View File

@@ -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);