[Bf-blender-cvs] [37ab16d] blender-v2.77-release: Cycles: Fix regression caused by recent camera-in-volume commit

Sergey Sharybin noreply at git.blender.org
Tue Apr 5 10:39:17 CEST 2016


Commit: 37ab16d0759f4d10375a09a7d6bde55a43693ef7
Author: Sergey Sharybin
Date:   Mon Apr 4 18:24:40 2016 +0200
Branches: blender-v2.77-release
https://developer.blender.org/rB37ab16d0759f4d10375a09a7d6bde55a43693ef7

Cycles: Fix regression caused by recent camera-in-volume commit

Stupid me forgot that we don't have stop-element in the stack yet.

===================================================================

M	intern/cycles/kernel/kernel_volume.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h
index 984eb7e..ef0d4f6 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.
 					 */




More information about the Bf-blender-cvs mailing list