archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'blender2.7'

Browse Source
This commit is contained in:
Brecht Van Lommel
2019-03-05 19:14:00 +01:00
parent 5e8e3c00f2 e290a0b056
commit 3428ec5984
5 changed files with 103 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/blender/blender_mesh.cpp
View 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;