diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-03-14 11:31:20 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-03-14 11:31:20 +0300 |
commit | 687e4b42d503de8cca77d74cc3449911fbd37bf6 (patch) | |
tree | 5c8b27f27ad8607b841687e390b00477d8664616 /intern/cycles/render | |
parent | 05fbb0d50eee8c5599da3e93d14c95c191ddeb51 (diff) | |
parent | 4887baf7d69c6c44c265044600ec00c77e9aa406 (diff) |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/render')
-rw-r--r-- | intern/cycles/render/nodes.cpp | 14 | ||||
-rw-r--r-- | intern/cycles/render/nodes.h | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index b70bad810de..cc9dd8f2679 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -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) diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h index 4590178395f..5571c525e9a 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -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; }; |