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

[Thomas Dinges]

Revision: 47629
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47629
Author:   dingto
Date:     2012-06-08 20:17:02 +0000 (Fri, 08 Jun 2012)
Log Message:
-----------
Cycles / Cleanup:
* All references to old textures should now be finally removed. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/app/cycles_xml.cpp
    trunk/blender/intern/cycles/render/nodes.cpp

Modified: trunk/blender/intern/cycles/app/cycles_xml.cpp
===================================================================
--- trunk/blender/intern/cycles/app/cycles_xml.cpp	2012-06-08 19:57:28 UTC (rev 47628)
+++ trunk/blender/intern/cycles/app/cycles_xml.cpp	2012-06-08 20:17:02 UTC (rev 47629)
@@ -392,9 +392,9 @@
 			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();

Modified: trunk/blender/intern/cycles/render/nodes.cpp
===================================================================
--- trunk/blender/intern/cycles/render/nodes.cpp	2012-06-08 19:57:28 UTC (rev 47628)
+++ trunk/blender/intern/cycles/render/nodes.cpp	2012-06-08 20:17:02 UTC (rev 47629)
@@ -695,7 +695,7 @@
 ShaderEnum WaveTextureNode::type_enum = wave_type_init();
 
 WaveTextureNode::WaveTextureNode()
-: TextureNode("marble_texture")
+: TextureNode("wave_texture")
 {
 	type = ustring("Bands");