blender
/
blender
131
398
Fork 577
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Merge branch 'blender2.7'

This commit is contained in:
Jeroen Bakker 2019-03-14 09:31:20 +01:00
parent 05fbb0d50e 4887baf7d6
commit 687e4b42d5
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3381,6 +3381,20 @@ void GeometryNode::compile(OSLCompiler& compiler)
compiler.add(this, "node_geometry");
}
int GeometryNode::get_group()
{
ShaderOutput *out;
int result = ShaderNode::get_group();
/* Backfacing uses NODE_LIGHT_PATH */
out = output("Backfacing");
if (!out->links.empty()) {
result = max(result, NODE_GROUP_LEVEL_1);
}
return result;
}
/* TextureCoordinate */
NODE_DEFINE(TextureCoordinateNode)

1
intern/cycles/render/nodes.h
View File

@ -668,6 +668,7 @@ public:
void attributes(Shader *shader, AttributeRequestSet *attributes);
bool has_attribute_dependency() { return true; }
bool has_spatial_varying() { return true; }
int get_group();
float3 normal_osl;
};