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

Code refactor: reduce special node types, use generic constant folding.

Browse Source
This commit is contained in:
Brecht Van Lommel
2016-05-02 00:05:16 +02:00
parent 2cfadecf97
commit dd8bfa0929
9 changed files with 200 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/render/osl.cpp
View File

@@ -483,11 +483,11 @@ bool OSLCompiler::node_skip_input(ShaderNode *node, ShaderInput *input)
if(strcmp(input->name, "Normal") == 0)
return true;
}
else if(node->name == ustring("bump")) {
else if(node->special_type == SHADER_SPECIAL_TYPE_BUMP) {
if(strcmp(input->name, "Height") == 0)
return true;
}
else if(current_type == SHADER_TYPE_DISPLACEMENT && input->link && input->link->parent->name == ustring("bump"))
else if(current_type == SHADER_TYPE_DISPLACEMENT && input->link && input->link->parent->special_type == SHADER_SPECIAL_TYPE_BUMP)
return true;
return false;