diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-19 17:49:54 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-19 17:49:54 +0300 |
| commit | 61af6b83e6757c692447cc13c01a7ede21a9756f (patch) | |
| tree | cc39057e12b8bbff1ad19d89a3f373fea6568053 | |
| parent | 750a78be9cfa71713bac5b73f9a61c40deeb994c (diff) | |
| parent | 9ff135d85dde3ee945eed95656e61dfba0e315d1 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/sculpt_paint/paint_image_proj.c
| -rw-r--r-- | intern/cycles/kernel/kernel_volume.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 4 |
2 files changed, 3 insertions, 3 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; diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index c9233416428..62bc379241f 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -3411,13 +3411,13 @@ static bool proj_paint_state_mesh_eval_init(const bContext *C, ProjPaintState *p else { ps->dm = mesh_get_derived_final( depsgraph, 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; } #endif ps->me_eval = mesh_get_eval_final( depsgraph, sce, ob, - sce->customdata_mask | CD_MASK_MLOOPUV | CD_MASK_MTFACE | (ps->do_face_sel ? CD_ORIGINDEX : 0)); + sce->customdata_mask | CD_MASK_MLOOPUV | CD_MASK_MTFACE | (ps->do_face_sel ? CD_MASK_ORIGINDEX : 0)); if (!CustomData_has_layer(&ps->me_eval->ldata, CD_MLOOPUV)) { ps->me_eval = NULL; return false; |