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

Merge branch 'blender2.7'

Browse Source
This commit is contained in:
Stefan Werner
2019-03-05 15:06:09 +01:00
parent cb7e66737d db7f9a70b0
commit c891fb2fbe
20 changed files with 452 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/render/nodes.cpp
View File

@@ -3480,7 +3480,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_FLOAT3);
compiler.add_node(attr_node, attr, compiler.stack_assign(out), NODE_ATTR_FLOAT2);
}
}