Merge branch 'blender-v2.93-release'

This commit is contained in:
Germano Cavalcante 2021-04-18 20:06:32 -03:00
commit 6879868814
1 changed files with 4 additions and 9 deletions

View File

@ -2258,16 +2258,11 @@ static short snapMesh(SnapObjectContext *sctx,
int *r_index)
{
BLI_assert(snapdata->snap_to_flag != SCE_SNAP_MODE_FACE);
if ((snapdata->snap_to_flag & ~SCE_SNAP_MODE_FACE) == SCE_SNAP_MODE_VERTEX) {
if (me->totvert == 0) {
return 0;
}
if (me->totvert == 0) {
return 0;
}
else {
if (me->totedge == 0) {
return 0;
}
else if (me->totedge == 0 && !(snapdata->snap_to_flag & SCE_SNAP_MODE_VERTEX)) {
return 0;
}
float lpmat[4][4];