From 25fc454ce02d3476333efcf78afcbb1d193e5c04 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Sun, 2 Sep 2012 12:46:54 +0000 Subject: [PATCH] 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. --- intern/cycles/kernel/osl/nodes/CMakeLists.txt | 1 - intern/cycles/render/nodes.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/intern/cycles/kernel/osl/nodes/CMakeLists.txt b/intern/cycles/kernel/osl/nodes/CMakeLists.txt index 5a645919358..9cebc2034b6 100644 --- 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 diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 3d9055119ed..b16b4298be3 100644 --- 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 */