Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-05 20:39:55 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-05 20:39:55 +0300
commit25c935e65fd901f42d2f26fede91749ee39b29f9 (patch)
tree24eee4bd01de939293f3474865d6a5e0f21a4b1e /intern
parent304a89eccfff0b2f8132013c2c4ccca60ec69fbd (diff)
Fix Cycles bug rendering with multiple UV maps after recent changes.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_mesh.cpp4
-rw-r--r--intern/cycles/render/nodes.cpp2
2 files changed, 3 insertions, 3 deletions
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);
}
}