Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2012-06-09 00:17:02 +0400
committerThomas Dinges <blender@dingto.org>2012-06-09 00:17:02 +0400
commit49a64a0ab7b728bfec0ecac928ac6963a283d89b (patch)
tree7eb7110453c9f3fca4bae34c365aae39e84e31e7 /intern
parent8a4f16739ae44c96568a0efae9f668c46bcf8035 (diff)
Cycles / Cleanup:
* All references to old textures should now be finally removed.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/app/cycles_xml.cpp6
-rw-r--r--intern/cycles/render/nodes.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index cfa4095104b..1190ee185fd 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -392,9 +392,9 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug
snode = dist;
}
else if(string_iequals(node.name(), "wave_texture")) {
- WaveTextureNode *wood = new WaveTextureNode();
- xml_read_enum(&wood->type, WaveTextureNode::type_enum, node, "type");
- snode = wood;
+ WaveTextureNode *wave = new WaveTextureNode();
+ xml_read_enum(&wave->type, WaveTextureNode::type_enum, node, "type");
+ snode = wave;
}
else if(string_iequals(node.name(), "normal")) {
snode = new NormalNode();
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 1c9eeacddbe..8fb92d2476e 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -695,7 +695,7 @@ static ShaderEnum wave_type_init()
ShaderEnum WaveTextureNode::type_enum = wave_type_init();
WaveTextureNode::WaveTextureNode()
-: TextureNode("marble_texture")
+: TextureNode("wave_texture")
{
type = ustring("Bands");