Commit: 73cfbb0ab937d837a40a03765108b3af11606b7c
Author: Lukas Stockner
Date: Wed Jun 22 16:10:10 2016 +0200
Branches: master
https://developer.blender.org/rB73cfbb0ab937d837a40a03765108b3af11606b7c
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.
===================================================================
M intern/cycles/render/nodes.cpp
===================================================================
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 1a9adb0..5e53b66 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");
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
