Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-06-11 12:07:05 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-06-11 12:07:05 +0400
commite969bb207d125e4641ea91a7b8d3e9a6fe131deb (patch)
treedc85e1a7baf5017998b133675dbefe2bc8a11d3c
parent401eaa448b7437c55aeec46b26f8c0e751f421ac (diff)
Fix compilation error caused by recent wavelength node commit
Apparently, it's bad idea to rely on compiler to cast NULL which is (void*)0 to int -- and in fact if i was a compiler would also generate an error. Further, couldn't see why we need to pass NULL or 0 th add_node, argument value is defautl to 0 already.
-rw-r--r--intern/cycles/render/nodes.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index bec45e23f7a..74033d5c2fa 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -2969,7 +2969,7 @@ void WavelengthNode::compile(SVMCompiler& compiler)
compiler.stack_assign(wavelength_in);
compiler.stack_assign(color_out);
- compiler.add_node(NODE_WAVELENGTH, wavelength_in->stack_offset, color_out->stack_offset, NULL);
+ compiler.add_node(NODE_WAVELENGTH, wavelength_in->stack_offset, color_out->stack_offset);
}
void WavelengthNode::compile(OSLCompiler& compiler)