Cycles / OSL:

* 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.
2012-09-02 12:46:54 +00:00
parent 23dca13691
commit 25fc454ce0
2 changed files with 1 additions and 2 deletions
--- a/intern/cycles/kernel/osl/nodes/CMakeLists.txt
+++ b/intern/cycles/kernel/osl/nodes/CMakeLists.txt
@@ -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
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -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 */