Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: image texture node now uses UV as default texture coordinate,

Browse Source 
instead of generated.
This commit is contained in:
Brecht Van Lommel
2011-10-12 16:01:37 +00:00
parent aff03aa778
commit 4c3b94fdbd
3 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
intern/cycles/render/graph.cpp
View File

@@ -117,9 +117,14 @@ ShaderOutput *ShaderNode::add_output(const char *name, ShaderSocketType type)
void ShaderNode::attributes(AttributeRequestSet *attributes)
{
foreach(ShaderInput *input, inputs)
if(!input->link && input->default_value == ShaderInput::TEXTURE_COORDINATE)
attributes->add(Attribute::STD_GENERATED);
foreach(ShaderInput *input, inputs) {
if(!input->link) {
if(input->default_value == ShaderInput::TEXTURE_GENERATED)
attributes->add(Attribute::STD_GENERATED);
else if(input->default_value == ShaderInput::TEXTURE_UV)
attributes->add(Attribute::STD_UV);
}
}
}
/* Graph */
@@ -347,12 +352,18 @@ void ShaderGraph::default_inputs(bool do_osl)
foreach(ShaderNode *node, nodes) {
foreach(ShaderInput *input, node->inputs) {
if(!input->link && !(input->osl_only && !do_osl)) {
if(input->default_value == ShaderInput::TEXTURE_COORDINATE) {
if(input->default_value == ShaderInput::TEXTURE_GENERATED) {
if(!texco)
texco = new TextureCoordinateNode();
connect(texco->output("Generated"), input);
}
else if(input->default_value == ShaderInput::TEXTURE_UV) {
if(!texco)
texco = new TextureCoordinateNode();
connect(texco->output("UV"), input);
}
else if(input->default_value == ShaderInput::INCOMING) {
if(!geom)
geom = new GeometryNode();