Commit: ca88bc5ac13efd8ea7157ab97396db51bb0bda64
Author: Thomas Dinges
Date: Fri Feb 5 21:33:37 2016 +0100
Branches: master
https://developer.blender.org/rBca88bc5ac13efd8ea7157ab97396db51bb0bda64
Cleanup: Rename has_heterogeneous_volume variable.
No functional changes, this change is done for consistency of upcoming changes.
===================================================================
M intern/cycles/render/osl.cpp
M intern/cycles/render/shader.cpp
M intern/cycles/render/shader.h
M intern/cycles/render/svm.cpp
===================================================================
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index bd53ff9..81c706c 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 6e8004e..6852d3f 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 954e1f5..5b8c531 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 140ebaa..d715419 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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
