[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50313] trunk/blender/intern/cycles: Cycles / OSL:

[Thomas Dinges]

Revision: 50313
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50313
Author:   dingto
Date:     2012-09-02 12:46:54 +0000 (Sun, 02 Sep 2012)
Log Message:
-----------
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. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
    trunk/blender/intern/cycles/render/nodes.cpp

Modified: trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt	2012-09-02 12:24:04 UTC (rev 50312)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt	2012-09-02 12:46:54 UTC (rev 50313)
@@ -34,7 +34,6 @@
 	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

Modified: trunk/blender/intern/cycles/render/nodes.cpp
===================================================================
--- trunk/blender/intern/cycles/render/nodes.cpp	2012-09-02 12:24:04 UTC (rev 50312)
+++ trunk/blender/intern/cycles/render/nodes.cpp	2012-09-02 12:46:54 UTC (rev 50313)
@@ -2408,7 +2408,7 @@
 
 void LayerWeightNode::compile(OSLCompiler& compiler)
 {
-	compiler.add(this, "node_layer_height");
+	compiler.add(this, "node_blend_weight");
 }
 
 /* Output */