diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-07-05 17:54:25 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-07-05 17:54:25 +0400 |
| commit | 3f3c6f5f1fb336f8f0015d7857a1ae153fa2a80f (patch) | |
| tree | 27e2ae66dd589013c24592fe0803b440a7e014be /source/blender/editors/transform/transform.c | |
| parent | 887fd19894047832fbb7a7300e5fc11438b1f3b2 (diff) | |
| parent | ccd31900ab9659b6fdc035fd91bff9f508334e22 (diff) | |
Merging from trunk up to r38119.
Diffstat (limited to 'source/blender/editors/transform/transform.c')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index b8369d8cbff..e1c41e7f763 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -5551,7 +5551,7 @@ static void doAnimEdit_SnapFrame(TransInfo *t, TransData *td, TransData2D *td2d, void initTimeTranslate(TransInfo *t) { /* this tool is only really available in the Action Editor... */ - if (t->spacetype != SPACE_ACTION) { + if (!ELEM(t->spacetype, SPACE_ACTION, SPACE_SEQ)) { t->state = TRANS_CANCEL; } |