[Bf-blender-cvs] [25c935e65fd] blender2.7: Fix Cycles bug rendering with multiple UV maps after recent changes.

[Brecht Van Lommel]

Commit: 25c935e65fd901f42d2f26fede91749ee39b29f9
Author: Brecht Van Lommel
Date:   Tue Mar 5 18:39:55 2019 +0100
Branches: blender2.7
https://developer.blender.org/rB25c935e65fd901f42d2f26fede91749ee39b29f9

Fix Cycles bug rendering with multiple UV maps after recent changes.

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

M	intern/cycles/blender/blender_mesh.cpp
M	intern/cycles/render/nodes.cpp

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

diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index cb9d23e121c..46ecd60be77 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -489,7 +489,7 @@ static void attr_create_uv_map(Scene *scene,
 				}
 				else {
 					uv_attr = mesh->attributes.add(uv_name,
-					                               TypeDesc::TypePoint,
+					                               TypeFloat2,
 					                               ATTR_ELEMENT_CORNER);
 				}
 
@@ -586,7 +586,7 @@ static void attr_create_subd_uv_map(Scene *scene,
 				if(active_render)
 					uv_attr = mesh->subd_attributes.add(uv_std, uv_name);
 				else
-					uv_attr = mesh->subd_attributes.add(uv_name, TypeDesc::TypePoint, ATTR_ELEMENT_CORNER);
+					uv_attr = mesh->subd_attributes.add(uv_name, TypeFloat2, ATTR_ELEMENT_CORNER);
 
 				if(subdivide_uvs) {
 					uv_attr->flags |= ATTR_SUBDIVIDED;
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index dc015b871e5..d32b1513e42 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -3483,7 +3483,7 @@ void TextureCoordinateNode::compile(SVMCompiler& compiler)
 		}
 		else {
 			int attr = compiler.attribute(ATTR_STD_UV);
-			compiler.add_node(attr_node, attr, compiler.stack_assign(out), NODE_ATTR_FLOAT2);
+			compiler.add_node(attr_node, attr, compiler.stack_assign(out), NODE_ATTR_FLOAT3);
 		}
 	}