From b5893b1ba3b36ce20575da617e7497a9df9fd72f Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 19 Jun 2018 16:25:24 +0200 Subject: Fix (unreported) passing CDLayer 'ID' instead of bitflag to a cdlayer mask! Probably harmless, since I bet CD_ORIGINDEX is nearly always generated, but still... --- source/blender/editors/sculpt_paint/paint_image_proj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 2ecd6500fdf..44da12c13e5 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -3434,7 +3434,7 @@ static bool proj_paint_state_dm_init(ProjPaintState *ps) else { ps->dm = mesh_get_derived_final( ps->scene, ps->ob, - ps->scene->customdata_mask | CD_MASK_MLOOPUV | CD_MASK_MTFACE | (ps->do_face_sel ? CD_ORIGINDEX : 0)); + ps->scene->customdata_mask | CD_MASK_MLOOPUV | CD_MASK_MTFACE | (ps->do_face_sel ? CD_MASK_ORIGINDEX : 0)); ps->dm_release = false; } -- cgit v1.2.3 From 9ff135d85dde3ee945eed95656e61dfba0e315d1 Mon Sep 17 00:00:00 2001 From: Stefan Werner Date: Tue, 19 Jun 2018 16:34:15 +0200 Subject: 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. --- intern/cycles/kernel/kernel_volume.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3