From 063c9938f1ecb52ddb697096918974485ef81da3 Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Sun, 18 Apr 2021 20:04:58 -0300 Subject: Fix snap mixed with vertices ignored for meshes with vertices only The logic assumed that there were only 3 basic snapping modes. --- source/blender/editors/transform/transform_snap_object.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'source/blender/editors') 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]; -- cgit v1.2.3