Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 19 Jun 2018 14:49:54 +0000 (16:49 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 19 Jun 2018 14:49:54 +0000 (16:49 +0200)
Conflicts:
source/blender/editors/sculpt_paint/paint_image_proj.c

1  2 
source/blender/editors/sculpt_paint/paint_image_proj.c

index c9233416428223d09573e275a2702581a1020f82,44da12c13e54672a215d28c6275cabd46094c619..62bc379241fb873ed998618171ed875ebc6b0975
@@@ -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;
        }