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:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-04-04 19:24:40 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-04-04 19:24:40 +0300
commitac8f4ba5301852c13f165c9d85dbc98f599d5195 (patch)
tree3d55295de63eeda29f97dc9f294137c565dd255a /intern/cycles/kernel/kernel_volume.h
parenta3d65525148062bceef6b4644dbe8bfaf20d83d7 (diff)
Cycles: Fix regression caused by recent camera-in-volume commit
Stupid me forgot that we don't have stop-element in the stack yet.
Diffstat (limited to 'intern/cycles/kernel/kernel_volume.h')
-rw-r--r--intern/cycles/kernel/kernel_volume.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h
index 3553cf7153b..1dc2c5f8fbb 100644
--- a/intern/cycles/kernel/kernel_volume.h
+++ b/intern/cycles/kernel/kernel_volume.h
@@ -1011,7 +1011,7 @@ ccl_device void kernel_volume_stack_init(KernelGlobals *kg,
shader_setup_from_ray(kg, &sd, isect, &volume_ray);
if(sd.flag & SD_BACKFACING) {
bool need_add = true;
- for(int i = 0; stack[i].shader != SHADER_NONE; ++i) {
+ for(int i = 0; i < stack_index; ++i) {
/* If ray exited the volume and never entered to that volume
* it means that camera is inside such a volume.
*/