[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57374] trunk/blender/intern/cycles/render /nodes.cpp: Fix compilation error caused by recent wavelength node commit
Sergey Sharybin
sergey.vfx at gmail.com
Tue Jun 11 10:07:05 CEST 2013
Revision: 57374
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57374
Author: nazgul
Date: 2013-06-11 08:07:05 +0000 (Tue, 11 Jun 2013)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/intern/cycles/render/nodes.cpp
Modified: trunk/blender/intern/cycles/render/nodes.cpp
===================================================================
--- trunk/blender/intern/cycles/render/nodes.cpp 2013-06-11 08:06:59 UTC (rev 57373)
+++ trunk/blender/intern/cycles/render/nodes.cpp 2013-06-11 08:07:05 UTC (rev 57374)
@@ -2969,7 +2969,7 @@
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)
More information about the Bf-blender-cvs
mailing list