Commit: 61af6b83e6757c692447cc13c01a7ede21a9756f
Author: Bastien Montagne
Date: Tue Jun 19 16:49:54 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB61af6b83e6757c692447cc13c01a7ede21a9756f
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/sculpt_paint/paint_image_proj.c
===================================================================
===================================================================
diff --cc source/blender/editors/sculpt_paint/paint_image_proj.c
index c9233416428,44da12c13e5..62bc379241f
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@@ -3410,16 -3433,17 +3410,16 @@@ static bool proj_paint_state_mesh_eval_
}
else {
ps->dm = mesh_get_derived_final(
- ps->scene, ps->ob,
+ 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;
}
-
- if (!CustomData_has_layer(&ps->dm->loopData, CD_MLOOPUV)) {
-
- if (ps->dm_release)
- ps->dm->release(ps->dm);
-
- ps->dm = NULL;
+#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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
