bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source 
Conflicts:
	source/blender/editors/sculpt_paint/paint_image_proj.c
This commit is contained in:
Bastien Montagne 2018-06-19 16:49:54 +02:00
commit 61af6b83e6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/kernel_volume.h
View File

@ -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;

4
source/blender/editors/sculpt_paint/paint_image_proj.c
View File

@ -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;