From ce44ffd74f749cebdaf2141486b4773bd98b0a41 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 1 Apr 2016 18:03:58 +0200 Subject: [PATCH] Cycles: Fix wrong camera-in-volume stack when camera ray hits volume domain twice --- intern/cycles/kernel/kernel_volume.h | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h index 70a1856f972..3553cf7153b 100644 --- a/intern/cycles/kernel/kernel_volume.h +++ b/intern/cycles/kernel/kernel_volume.h @@ -1010,17 +1010,22 @@ ccl_device void kernel_volume_stack_init(KernelGlobals *kg, ShaderData sd; shader_setup_from_ray(kg, &sd, isect, &volume_ray); if(sd.flag & SD_BACKFACING) { - /* If ray exited the volume and never entered to that volume - * it means that camera is inside such a volume. - */ - bool is_enclosed = false; - for(int i = 0; i < enclosed_index; ++i) { - if(enclosed_volumes[i] == sd.object) { - is_enclosed = true; + bool need_add = true; + for(int i = 0; stack[i].shader != SHADER_NONE; ++i) { + /* If ray exited the volume and never entered to that volume + * it means that camera is inside such a volume. + */ + if(i < enclosed_index && enclosed_volumes[i] == sd.object) { + need_add = false; + break; + } + /* Don't add intersections twice. */ + if(stack[i].object == sd.object) { + need_add = false; break; } } - if(is_enclosed == false) { + if(need_add) { stack[stack_index].object = sd.object; stack[stack_index].shader = sd.shader; ++stack_index;