[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51110] trunk/blender/intern/cycles/render /nodes.cpp: Fix for UV texture coordinate problem in cycles, after recent fix.

[Brecht Van Lommel]

Revision: 51110
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51110
Author:   blendix
Date:     2012-10-06 11:52:54 +0000 (Sat, 06 Oct 2012)
Log Message:
-----------
Fix for UV texture coordinate problem in cycles, after recent fix.

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

Modified: trunk/blender/intern/cycles/render/nodes.cpp
===================================================================
--- trunk/blender/intern/cycles/render/nodes.cpp	2012-10-06 11:00:45 UTC (rev 51109)
+++ trunk/blender/intern/cycles/render/nodes.cpp	2012-10-06 11:52:54 UTC (rev 51110)
@@ -1650,10 +1650,12 @@
 
 void TextureCoordinateNode::attributes(AttributeRequestSet *attributes)
 {
-	if(!output("Generated")->links.empty())
-		attributes->add(ATTR_STD_GENERATED);
-	if(!output("UV")->links.empty())
-		attributes->add(ATTR_STD_UV);
+	if(!from_dupli) {
+		if(!output("Generated")->links.empty())
+			attributes->add(ATTR_STD_GENERATED);
+		if(!output("UV")->links.empty())
+			attributes->add(ATTR_STD_UV);
+	}
 
 	ShaderNode::attributes(attributes);
 }
@@ -1704,13 +1706,13 @@
 	out = output("UV");
 	if(!out->links.empty()) {
 		if(from_dupli) {
-			int attr = compiler.attribute(ATTR_STD_UV);
 			compiler.stack_assign(out);
-			compiler.add_node(attr_node, attr, out->stack_offset, NODE_ATTR_FLOAT3);
+			compiler.add_node(texco_node, NODE_TEXCO_DUPLI_UV, out->stack_offset);
 		}
 		else {
+			int attr = compiler.attribute(ATTR_STD_UV);
 			compiler.stack_assign(out);
-			compiler.add_node(texco_node, NODE_TEXCO_DUPLI_UV, out->stack_offset);
+			compiler.add_node(attr_node, attr, out->stack_offset, NODE_ATTR_FLOAT3);
 		}
 	}