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

Cleanup: Rename has_heterogeneous_volume variable.

Browse Source 
No functional changes, this change is done for consistency of upcoming changes.
This commit is contained in:
Thomas Dinges
2016-02-05 21:33:37 +01:00
parent 2685d45fa2
commit ca88bc5ac1
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -582,7 +582,7 @@ void OSLCompiler::add(ShaderNode *node, const char *name, bool isfilepath)
}
else if(current_type == SHADER_TYPE_VOLUME) {
if(node->has_spatial_varying())
current_shader->has_heterogeneous_volume = true;
current_shader->has_volume_spatial_varying = true;
}
if(node->has_object_dependency()) {
@@ -760,7 +760,7 @@ void OSLCompiler::generate_nodes(const ShaderNodeSet& nodes)
}
else if(current_type == SHADER_TYPE_VOLUME) {
if(node->has_spatial_varying())
current_shader->has_heterogeneous_volume = true;
current_shader->has_volume_spatial_varying = true;
}
}
else
@@ -839,7 +839,7 @@ void OSLCompiler::compile(Scene *scene, OSLGlobals *og, Shader *shader)
shader->has_bssrdf_bump = false;
shader->has_volume = false;
shader->has_displacement = false;
shader->has_heterogeneous_volume = false;
shader->has_volume_spatial_varying = false;
shader->has_object_dependency = false;
shader->has_integrator_dependency = false;

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

@@ -152,7 +152,7 @@ Shader::Shader()
has_volume = false;
has_displacement = false;
has_bssrdf_bump = false;
has_heterogeneous_volume = false;
has_volume_spatial_varying = false;
has_object_dependency = false;
has_integrator_dependency = false;
@@ -362,7 +362,7 @@ void ShaderManager::device_update_common(Device *device,
*/
flag |= SD_HAS_TRANSPARENT_SHADOW;
}
if(shader->heterogeneous_volume && shader->has_heterogeneous_volume)
if(shader->heterogeneous_volume && shader->has_volume_spatial_varying)
flag |= SD_HETEROGENEOUS_VOLUME;
if(shader->has_bssrdf_bump)
flag |= SD_HAS_BSSRDF_BUMP;

2
intern/cycles/render/shader.h
View File

@@ -106,7 +106,7 @@ public:
bool has_displacement;
bool has_surface_bssrdf;
bool has_bssrdf_bump;
bool has_heterogeneous_volume;
bool has_volume_spatial_varying;
bool has_object_dependency;
bool has_integrator_dependency;

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

@@ -399,7 +399,7 @@ void SVMCompiler::generate_node(ShaderNode *node, ShaderNodeSet& done)
if(current_type == SHADER_TYPE_VOLUME) {
if(node->has_spatial_varying())
current_shader->has_heterogeneous_volume = true;
current_shader->has_volume_spatial_varying = true;
}
if(node->has_object_dependency()) {
@@ -761,7 +761,7 @@ void SVMCompiler::compile(Scene *scene,
shader->has_bssrdf_bump = false;
shader->has_volume = false;
shader->has_displacement = false;
shader->has_heterogeneous_volume = false;
shader->has_volume_spatial_varying = false;
shader->has_object_dependency = false;
shader->has_integrator_dependency = false;