Merge branch 'master' into blender2.8

Conflicts:
	source/blender/editors/sculpt_paint/paint_image_proj.c

1 files changed, 1 insertions, 1 deletions

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;