diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-03-08 01:01:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-03-08 01:01:52 +0300 |
| commit | ff2cf426219bf0b2d245156e81bffc6a703bb73e (patch) | |
| tree | 7c17da5b2aef75523c0bf567c69fe111c4a9d17c /source/blender/src/transform_generics.c | |
| parent | 5b3dc15880b698a53f4e87c9efe2bb35139aaf25 (diff) | |
bugfix for [#8433] Retopo doesn't work with AutoMerge Editing.
Disable retopo while snapping, then run after. This means automerge happens first which is more useful.
Diffstat (limited to 'source/blender/src/transform_generics.c')
| -rw-r--r-- | source/blender/src/transform_generics.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/src/transform_generics.c b/source/blender/src/transform_generics.c index 1f6d8ecf7af..47a7bd5299f 100644 --- a/source/blender/src/transform_generics.c +++ b/source/blender/src/transform_generics.c @@ -378,8 +378,9 @@ void recalcData(TransInfo *t) if (G.sima->flag & SI_LIVE_UNWRAP) unwrap_lscm_live_re_solve(); } else { - - retopo_do_all(); + /* Only retopo if not snapping, Note, this is the only case of G.qual being used, but we have no T_SHIFT_MOD - Campbell */ + if ((G.qual & LR_CTRLKEY)==0) + retopo_do_all(); /* mirror modifier clipping? */ if(t->state != TRANS_CANCEL) |