diff options
author | Germano Cavalcante <germano.costa@ig.com.br> | 2021-04-19 02:06:32 +0300 |
---|---|---|
committer | Germano Cavalcante <germano.costa@ig.com.br> | 2021-04-19 02:06:32 +0300 |
commit | 6879868814eee0522fd2d6af46a9d9d6b3a9e60b (patch) | |
tree | 004ce49975d9dd9ef3b0ce2844cdadab8c09b968 /source/blender | |
parent | 9a69653b429e80eea18cb246d587ef6eeddfd9f6 (diff) | |
parent | 063c9938f1ecb52ddb697096918974485ef81da3 (diff) |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/transform/transform_snap_object.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 1e07767e97e..8bed4cfff1e 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -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]; |