diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-08-27 04:09:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-27 04:11:09 +0300 |
| commit | a32a4059da7e0230bbbd224788565ecb4c0d3ce4 (patch) | |
| tree | 3c54c045363e5a8ed69451be668b3576c9fece98 /source/blender/editors/transform | |
| parent | 2633928e1def66c63e89a4534fdcc0d9c268c7c4 (diff) | |
Fix crash switching to rotate from edge-slide
Caused by own fix for T45458
Diffstat (limited to 'source/blender/editors/transform')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 3f9077421b1..3cc53807d8d 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1063,15 +1063,14 @@ int transformEvent(TransInfo *t, const wmEvent *event) /* only switch when... */ if (!(t->options & CTX_TEXTURE) && !(t->options & (CTX_MOVIECLIP | CTX_MASK))) { if (ELEM(t->mode, TFM_ROTATION, TFM_RESIZE, TFM_TRACKBALL, TFM_TRANSLATION, TFM_EDGE_SLIDE, TFM_VERT_SLIDE)) { + restoreTransObjects(t); resetTransModal(t); resetTransRestrictions(t); if (t->mode == TFM_ROTATION) { - restoreTransObjects(t); initTrackball(t); } else { - restoreTransObjects(t); initRotation(t); } initSnapping(t, NULL); // need to reinit after mode change @@ -1363,15 +1362,14 @@ int transformEvent(TransInfo *t, const wmEvent *event) /* only switch when... */ if (!(t->options & CTX_TEXTURE)) { if (ELEM(t->mode, TFM_ROTATION, TFM_RESIZE, TFM_TRACKBALL, TFM_TRANSLATION)) { + restoreTransObjects(t); resetTransModal(t); resetTransRestrictions(t); if (t->mode == TFM_ROTATION) { - restoreTransObjects(t); initTrackball(t); } else { - restoreTransObjects(t); initRotation(t); } initSnapping(t, NULL); // need to reinit after mode change |