diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2016-06-22 17:10:10 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2016-06-22 17:12:40 +0300 |
| commit | 73cfbb0ab937d837a40a03765108b3af11606b7c (patch) | |
| tree | abf85980172f86a53c8ee600b81ecea480a3de01 | |
| parent | b204bdad47ffbd92b7b6702e2a680da9cbd6489a (diff) | |
Cycles: Fix crash with Environment Texture and OSL
In the OSL node compilation code for the Environment Texture, is_linear was used as a socket.
However, there was no socket for it, which caused Blender to crash.
Adding a socket doesn't really make sense since it's an internal value and not a parameter
of the node, so it now just uses the variable directly.
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 1a9adb08194..5e53b66f710 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -581,7 +581,7 @@ void EnvironmentTextureNode::compile(OSLCompiler& compiler) compiler.parameter("color_space", "sRGB"); compiler.parameter(this, "interpolation"); - compiler.parameter(this, "is_float"); + compiler.parameter("is_float", is_float); compiler.parameter("use_alpha", !alpha_out->links.empty()); compiler.add(this, "node_environment_texture"); } |