forked from bartvdbraak/blender
Fix for UV texture coordinate problem in cycles, after recent fix.
This commit is contained in:
parent
a2d8cf333f
commit
098d611c7b
@ -1650,10 +1650,12 @@ TextureCoordinateNode::TextureCoordinateNode()
|
||||
|
||||
void TextureCoordinateNode::attributes(AttributeRequestSet *attributes)
|
||||
{
|
||||
if(!output("Generated")->links.empty())
|
||||
attributes->add(ATTR_STD_GENERATED);
|
||||
if(!output("UV")->links.empty())
|
||||
attributes->add(ATTR_STD_UV);
|
||||
if(!from_dupli) {
|
||||
if(!output("Generated")->links.empty())
|
||||
attributes->add(ATTR_STD_GENERATED);
|
||||
if(!output("UV")->links.empty())
|
||||
attributes->add(ATTR_STD_UV);
|
||||
}
|
||||
|
||||
ShaderNode::attributes(attributes);
|
||||
}
|
||||
@ -1704,14 +1706,14 @@ void TextureCoordinateNode::compile(SVMCompiler& compiler)
|
||||
out = output("UV");
|
||||
if(!out->links.empty()) {
|
||||
if(from_dupli) {
|
||||
compiler.stack_assign(out);
|
||||
compiler.add_node(texco_node, NODE_TEXCO_DUPLI_UV, out->stack_offset);
|
||||
}
|
||||
else {
|
||||
int attr = compiler.attribute(ATTR_STD_UV);
|
||||
compiler.stack_assign(out);
|
||||
compiler.add_node(attr_node, attr, out->stack_offset, NODE_ATTR_FLOAT3);
|
||||
}
|
||||
else {
|
||||
compiler.stack_assign(out);
|
||||
compiler.add_node(texco_node, NODE_TEXCO_DUPLI_UV, out->stack_offset);
|
||||
}
|
||||
}
|
||||
|
||||
out = output("Object");
|
||||
|
Loading…
Reference in New Issue
Block a user