Commit: caaf4e5a37119a4b479efaa8d9f00f0298646a25
Author: Bastien Montagne
Date: Tue Jun 19 10:52:01 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBcaaf4e5a37119a4b479efaa8d9f00f0298646a25
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 6175b6c6209,2ecd6500fdf..d60601acc7b
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@@ -3416,21 -3428,14 +3416,15 @@@ static bool proj_paint_state_dm_init(co
/* Workaround for subsurf selection, try the display mesh first */
if (ps->source == PROJ_SRC_IMAGE_CAM) {
/* using render mesh, assume only camera was rendered from */
- ps->dm = mesh_create_derived_render(depsgraph, ps->scene,
ps->ob, ps->scene->customdata_mask | CD_MASK_MTFACE);
- ps->dm = mesh_create_derived_render(ps->scene, ps->ob,
ps->scene->customdata_mask | CD_MASK_MLOOPUV | CD_MASK_MTFACE);
++ ps->dm = mesh_create_derived_render(
++ depsgraph, ps->scene, ps->ob,
ps->scene->customdata_mask | CD_MASK_MLOOPUV | CD_MASK_MTFACE);
ps->dm_release = true;
}
- else if (ps->ob->derivedFinal &&
- CustomData_has_layer(&ps->ob->derivedFinal->loopData,
CD_MLOOPUV) &&
- (ps->do_face_sel == false ||
CustomData_has_layer(&ps->ob->derivedFinal->polyData, CD_ORIGINDEX)))
- {
- ps->dm = ps->ob->derivedFinal;
- ps->dm_release = false;
- }
else {
ps->dm = mesh_get_derived_final(
- ps->scene, ps->ob,
+ depsgraph, ps->scene, ps->ob,
- ps->scene->customdata_mask | CD_MASK_MTFACE |
(ps->do_face_sel ? CD_ORIGINDEX : 0));
- ps->dm_release = true;
+ ps->scene->customdata_mask | CD_MASK_MLOOPUV |
CD_MASK_MTFACE | (ps->do_face_sel ? CD_ORIGINDEX : 0));
+ ps->dm_release = false;
}
if (!CustomData_has_layer(&ps->dm->loopData, CD_MLOOPUV)) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
