diff options
author | Thomas Dinges <blender@dingto.org> | 2016-02-05 23:33:37 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2016-02-05 23:33:37 +0300 |
commit | ca88bc5ac13efd8ea7157ab97396db51bb0bda64 (patch) | |
tree | 067bb45118580b769c260ed64a8faf2283f4ffec | |
parent | 2685d45fa2b26e713b9e7d0e9f618fffe62a843c (diff) |
Cleanup: Rename has_heterogeneous_volume variable.
No functional changes, this change is done for consistency of upcoming changes.
-rw-r--r-- | intern/cycles/render/osl.cpp | 6 | ||||
-rw-r--r-- | intern/cycles/render/shader.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/render/shader.h | 2 | ||||
-rw-r--r-- | intern/cycles/render/svm.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index bd53ff90bb9..81c706ca1bc 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -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; diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp index 6e8004e6ce8..6852d3f0608 100644 --- a/intern/cycles/render/shader.cpp +++ b/intern/cycles/render/shader.cpp @@ -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; diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h index 954e1f56fff..5b8c53110eb 100644 --- a/intern/cycles/render/shader.h +++ b/intern/cycles/render/shader.h @@ -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; diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp index 140ebaa55b8..d715419530b 100644 --- a/intern/cycles/render/svm.cpp +++ b/intern/cycles/render/svm.cpp @@ -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; |