diff options
author | Germano Cavalcante <germano.costa@ig.com.br> | 2021-04-19 02:04:58 +0300 |
---|---|---|
committer | Germano Cavalcante <germano.costa@ig.com.br> | 2021-04-19 02:04:58 +0300 |
commit | 063c9938f1ecb52ddb697096918974485ef81da3 (patch) | |
tree | 4faaf283548214336315c3529c0275c5dd747f43 /source/blender | |
parent | 06888a8970b78f16c44f4393b937948853394315 (diff) |
Fix snap mixed with vertices ignored for meshes with vertices only
The logic assumed that there were only 3 basic snapping modes.
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 58198f21ba2..ec98b6af169 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -2231,16 +2231,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]; |