[Bf-blender-cvs] [66f96e5] master: Cycles: Fix copy / paste mistake in XML reader.

Thomas Dinges noreply at git.blender.org
Mon May 4 14:31:27 CEST 2015


Commit: 66f96e555c19e2572df5a0056c5b3ea8f861f40f
Author: Thomas Dinges
Date:   Mon May 4 14:29:38 2015 +0200
Branches: master
https://developer.blender.org/rB66f96e555c19e2572df5a0056c5b3ea8f861f40f

Cycles: Fix copy / paste mistake in XML reader.

===================================================================

M	intern/cycles/app/cycles_xml.cpp

===================================================================

diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 3825746..b47f20b 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -647,10 +647,10 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug
 			snode = new SeparateHSVNode();
 		}
 		else if(string_iequals(node.name(), "combine_xyz")) {
-			snode = new CombineHSVNode();
+			snode = new CombineXYZNode();
 		}
 		else if(string_iequals(node.name(), "separate_xyz")) {
-			snode = new SeparateHSVNode();
+			snode = new SeparateXYZNode();
 		}
 		else if(string_iequals(node.name(), "hsv")) {
 			snode = new HSVNode();




More information about the Bf-blender-cvs mailing list