diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-10-08 19:50:42 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-08 19:50:42 +0400 |
| commit | ff07676b4047719236186e605d6578e1816b6cdc (patch) | |
| tree | d8367201058cd81f3b7b6f56f283721596b3f0ca /source/blender/editors/transform/transform_conversions.c | |
| parent | 66634e2be41be8530bec49b3bab27dfa4ea176d3 (diff) | |
bring back automerge - [#19538] automerge editing doesn't work
Diffstat (limited to 'source/blender/editors/transform/transform_conversions.c')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index a9c3e4676a0..51ce87803fd 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -4477,8 +4477,8 @@ void special_aftertrans_update(TransInfo *t) if (t->spacetype==SPACE_VIEW3D) { if (t->obedit) { if (cancelled==0) { + EM_automerge(t->scene, t->obedit, 1); #if 0 // TRANSFORM_FIX_ME - EM_automerge(1); /* when snapping, delay retopo until after automerge */ if (G.qual & LR_CTRLKEY) { retopo_do_all(); |