diff options
Diffstat (limited to 'source/blender/editors/transform/transform_snap.c')
| -rw-r--r-- | source/blender/editors/transform/transform_snap.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 14242f6ba40..571ce7a6bc2 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -633,14 +633,12 @@ static void initSnappingMode(TransInfo *t) (obedit_type == -1)) // Object Mode { - if (t->options & (CTX_GPENCIL_STROKES | CTX_CURSOR)) { + if (t->options & (CTX_GPENCIL_STROKES | CTX_CURSOR | CTX_OBMODE_XFORM_OBDATA)) { /* In "Edit Strokes" mode, * snap tool can perform snap to selected or active objects (see T49632) - * TODO: perform self snap in gpencil_strokes */ - t->tsnap.modeSelect = SNAP_ALL; - } - else if (t->flag & T_OBJECT_DATA_IN_OBJECT_MODE) { - /* When we're moving the origins, allow snapping onto our own geometry (see T69132). */ + * TODO: perform self snap in gpencil_strokes. + * + * When we're moving the origins, allow snapping onto our own geometry (see T69132). */ t->tsnap.modeSelect = SNAP_ALL; } else { @@ -1251,7 +1249,7 @@ static void TargetSnapClosest(TransInfo *t) for (td = tc->data, i = 0; i < tc->data_len && td->flag & TD_SELECTED; i++, td++) { const BoundBox *bb = NULL; - if ((t->flag & T_OBJECT_DATA_IN_OBJECT_MODE) == 0) { + if ((t->options & CTX_OBMODE_XFORM_OBDATA) == 0) { bb = BKE_object_boundbox_get(td->ob); } |