Merge branch 'blender2.7'
[blender.git] / intern / cycles / blender / blender_mesh.cpp
index fa61caf..41fb36c 100644 (file)
@@ -430,7 +430,7 @@ static void attr_create_uv_map(Scene *scene,
                                }
                                else {
                                        uv_attr = mesh->attributes.add(uv_name,
-                                                                      TypeDesc::TypePoint,
+                                                                      TypeFloat2,
                                                                       ATTR_ELEMENT_CORNER);
                                }
 
@@ -509,7 +509,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;