From e836d2a1695cdcaf5bfdb01b6bebd663b977bf28 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Thu, 16 Dec 2010 17:19:24 +0000 Subject: [PATCH] Bugfix, irc report After using loop-cut with multiple edges, transform widget disappeared. Reason was a variable being set in function not being called on cancelled operators. Now it's in Posttrans() --- .../blender/editors/transform/transform_conversions.c | 10 ---------- source/blender/editors/transform/transform_generics.c | 7 +++++++ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index d545acfb93a..4784f47218f 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -5122,16 +5122,6 @@ void special_aftertrans_update(bContext *C, TransInfo *t) clear_trans_object_base_flags(t); - if(t->spacetype == SPACE_VIEW3D) - { - View3D *v3d = t->view; - - /* restore manipulator */ - if (t->flag & T_MODAL) { - v3d->twtype = t->twtype; - } - } - #if 0 // TRANSFORM_FIX_ME if(resetslowpar) diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 8b47fbd5b4c..7dbc0b9c633 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1159,6 +1159,13 @@ void postTrans (bContext *C, TransInfo *t) if(sima->flag & SI_LIVE_UNWRAP) ED_uvedit_live_unwrap_end(t->state == TRANS_CANCEL); } + else if(t->spacetype==SPACE_VIEW3D) { + View3D *v3d = t->sa->spacedata.first; + /* restore manipulator */ + if (t->flag & T_MODAL) { + v3d->twtype = t->twtype; + } + } if (t->mouse.data) {