Cycles / OSL:
authorThomas Dinges <blender@dingto.org>
Sun, 2 Sep 2012 12:46:54 +0000 (12:46 +0000)
committerThomas Dinges <blender@dingto.org>
Sun, 2 Sep 2012 12:46:54 +0000 (12:46 +0000)
* Remove declaration of node_blend_weight_texture from cmake, does not exist, and match node_blend_weight name in nodes.cpp with the actual file.

intern/cycles/kernel/osl/nodes/CMakeLists.txt
intern/cycles/render/nodes.cpp

index 5a64591935850eae97d11563fb9a71813fd5c8bf..9cebc2034b6f6bc7edd234fe568382178a190cc2 100644 (file)
@@ -34,7 +34,6 @@ set(SRC_OSL
        node_mix_closure.osl
        node_musgrave_texture.osl
        node_normal.osl
-       node_blend_weight_texture.osl
        node_noise_texture.osl
        node_output_displacement.osl
        node_output_surface.osl
index 3d9055119ed41ea2838aa3a3ff60f0c3938299b0..b16b4298be3962a893c4688908d28ce6bb66e6d3 100644 (file)
@@ -2408,7 +2408,7 @@ void LayerWeightNode::compile(SVMCompiler& compiler)
 
 void LayerWeightNode::compile(OSLCompiler& compiler)
 {
-       compiler.add(this, "node_layer_height");
+       compiler.add(this, "node_blend_weight");
 }
 
 /* Output */