[Bf-blender-cvs] [9ff135d85dd] master: Cycles: Fixed crash when the camera was inside 16 volumes or more. It still won't render those volumes correctly, but at least the crash is addressed.

Stefan Werner noreply at git.blender.org
Tue Jun 19 16:35:28 CEST 2018


Commit: 9ff135d85dde3ee945eed95656e61dfba0e315d1
Author: Stefan Werner
Date:   Tue Jun 19 16:34:15 2018 +0200
Branches: master
https://developer.blender.org/rB9ff135d85dde3ee945eed95656e61dfba0e315d1

Cycles: Fixed crash when the camera was inside 16 volumes or more. It still won't render those volumes correctly, but at least the crash is addressed.

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

M	intern/cycles/kernel/kernel_volume.h

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

diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h
index 86378289b02..58032545338 100644
--- a/intern/cycles/kernel/kernel_volume.h
+++ b/intern/cycles/kernel/kernel_volume.h
@@ -1172,7 +1172,7 @@ ccl_device void kernel_volume_stack_init(KernelGlobals *kg,
 						break;
 					}
 				}
-				if(need_add) {
+				if(need_add && stack_index < VOLUME_STACK_SIZE - 1) {
 					stack[stack_index].object = stack_sd->object;
 					stack[stack_index].shader = stack_sd->shader;
 					++stack_index;



More information about the Bf-blender-cvs mailing list