griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bug since 2.45 nobody noticed, canceling retopo would move the vert.

Browse Source
This commit is contained in:
Campbell Barton
2008-04-19 19:50:46 +00:00
parent 0a31175101
commit eb7edc4cba
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/src/transform_conversions.c
View File

@@ -3428,10 +3428,14 @@ void special_aftertrans_update(TransInfo *t)
int cancelled= (t->state == TRANS_CANCEL);
if (t->spacetype==SPACE_VIEW3D) {
EM_automerge(1);
/* when snapping, delay retopo until after automerge */
if (G.qual & LR_CTRLKEY) {
retopo_do_all();
if (G.obedit) {
if (cancelled==0) {
EM_automerge(1);
/* when snapping, delay retopo until after automerge */
if (G.qual & LR_CTRLKEY) {
retopo_do_all();
}
}
}
}
if (t->spacetype == SPACE_ACTION) {

12
source/blender/src/transform_generics.c
View File

@@ -378,14 +378,14 @@ void recalcData(TransInfo *t)
if (G.sima->flag & SI_LIVE_UNWRAP)
unwrap_lscm_live_re_solve();
} else {
/* 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)
if(t->state != TRANS_CANCEL) {
if ((G.qual & LR_CTRLKEY)==0) {
/* Only retopo if not snapping, Note, this is the only case of G.qual being used, but we have no T_SHIFT_MOD - Campbell */
retopo_do_all();
}
clipMirrorModifier(t, G.obedit);
}
if((t->context & CTX_NO_MIRROR) == 0 && (G.scene->toolsettings->editbutflag & B_MESH_X_MIRROR))
editmesh_apply_to_mirror(t);