Commit: ac8f4ba5301852c13f165c9d85dbc98f599d5195
Author: Sergey Sharybin
Date: Mon Apr 4 18:24:40 2016 +0200
Branches: master
https://developer.blender.org/rBac8f4ba5301852c13f165c9d85dbc98f599d5195
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 3553cf7..1dc2c5f 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.
*/
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
