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

Fix for auto detect homogeneous volume with OSL, forgot to include this file in last commit.

Browse Source
This commit is contained in:
Brecht Van Lommel
2014-04-04 13:20:46 +02:00
parent 2a82b8ade5
commit cb0520f79a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -553,6 +553,10 @@ void OSLCompiler::add(ShaderNode *node, const char *name, bool isfilepath)
current_shader->has_bssrdf_bump = true; /* can't detect yet */ current_shader->has_bssrdf_bump = true; /* can't detect yet */
} }
} }
else if(current_type == SHADER_TYPE_VOLUME) {
if(node->has_spatial_varying())
current_shader->has_heterogeneous_volume = true;
}
} }
void OSLCompiler::parameter(const char *name, float f) void OSLCompiler::parameter(const char *name, float f)
@@ -719,6 +723,10 @@ void OSLCompiler::generate_nodes(const set<ShaderNode*>& nodes)
current_shader->has_bssrdf_bump = true; current_shader->has_bssrdf_bump = true;
} }
} }
else if(current_type == SHADER_TYPE_VOLUME) {
if(node->has_spatial_varying())
current_shader->has_heterogeneous_volume = true;
}
} }
else else
nodes_done = false; nodes_done = false;
@@ -799,6 +807,7 @@ void OSLCompiler::compile(OSLGlobals *og, Shader *shader)
shader->has_bssrdf_bump = false; shader->has_bssrdf_bump = false;
shader->has_volume = false; shader->has_volume = false;
shader->has_displacement = false; shader->has_displacement = false;
shader->has_heterogeneous_volume = false;
/* generate surface shader */ /* generate surface shader */
if(shader->used && graph && output->input("Surface")->link) { if(shader->used && graph && output->input("Surface")->link) {