Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2016-02-05 23:33:37 +0300
committerThomas Dinges <blender@dingto.org>2016-02-05 23:33:37 +0300
commitca88bc5ac13efd8ea7157ab97396db51bb0bda64 (patch)
tree067bb45118580b769c260ed64a8faf2283f4ffec /intern/cycles/render/shader.cpp
parent2685d45fa2b26e713b9e7d0e9f618fffe62a843c (diff)
Cleanup: Rename has_heterogeneous_volume variable.
No functional changes, this change is done for consistency of upcoming changes.
Diffstat (limited to 'intern/cycles/render/shader.cpp')
-rw-r--r--intern/cycles/render/shader.cpp4
1 files changed, 2 insertions, 2 deletions
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;