diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-01-08 21:46:21 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-01-08 21:46:21 +0300 |
| commit | 16e7a2618524a375541ddddc951cedc0a346179c (patch) | |
| tree | 8223fa10eec5202b6b1cc9ea0da37da421bba8da /source/blender/editors/transform | |
| parent | ac56fef2289a1beab58ee04a695bebb97c44056a (diff) | |
Bugfix, IRC report
Texture space transform, SHIFT+R crashed
Diffstat (limited to 'source/blender/editors/transform')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 981899083ce..4ef8b80f1aa 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -862,20 +862,22 @@ int transformEvent(TransInfo *t, wmEvent *event) break; case RKEY: /* only switch when... */ - if( ELEM4(t->mode, TFM_ROTATION, TFM_RESIZE, TFM_TRACKBALL, TFM_TRANSLATION) ) { + if(!(t->options & CTX_TEXTURE)) { + if( ELEM4(t->mode, TFM_ROTATION, TFM_RESIZE, TFM_TRACKBALL, TFM_TRANSLATION) ) { - resetTransRestrictions(t); + resetTransRestrictions(t); - if (t->mode == TFM_ROTATION) { - restoreTransObjects(t); - initTrackball(t); - } - else { - restoreTransObjects(t); - initRotation(t); + if (t->mode == TFM_ROTATION) { + restoreTransObjects(t); + initTrackball(t); + } + else { + restoreTransObjects(t); + initRotation(t); + } + initSnapping(t, NULL); // need to reinit after mode change + t->redraw |= TREDRAW_HARD; } - initSnapping(t, NULL); // need to reinit after mode change - t->redraw |= TREDRAW_HARD; } break; case CKEY: |