diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-03-27 09:06:11 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-03-27 09:06:11 +0300 |
commit | 607d86167c84b97df144e7a4ed0d27466340cae1 (patch) | |
tree | 7d2d16c8fc752c042ddc28c544dcca0dd74ac6c4 /source/blender/editors/transform | |
parent | 2c585ae28ef7cdba01894144076ad3fa60ef1ff9 (diff) |
* sequencer transform needs t->data not to be freed by postTrans so special_aftertrans_update can use it.
* text header needs a static char* so text is not rendered as gibberish. (until labels own their own strings)
* epy_doc_gen.py - write out a graphviz representation of the data api.
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 6 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index c0bc87ebb3e..e4c1f8dc3f1 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -4386,7 +4386,6 @@ void special_aftertrans_update(TransInfo *t) ListBase *seqbasep= ed->seqbasep; int a; TransData *td= t->data; - TransData2D *td2d= t->data2d; TransDataSeq *tdsq= NULL; Sequence *seq; @@ -4398,7 +4397,7 @@ void special_aftertrans_update(TransInfo *t) Sequence *seq_prev= NULL; /* flush to 2d vector from internally used 3d vector */ - for(a=0; a<t->total; a++, td++, td2d++) { + for(a=0; a<t->total; a++, td++) { tdsq= (TransDataSeq *)td->extra; seq= tdsq->seq; @@ -4429,7 +4428,8 @@ void special_aftertrans_update(TransInfo *t) if (t->customData) MEM_freeN(t->customData); - + if (t->data) + MEM_freeN(t->data); // XXX postTrans useually does this } else if (t->spacetype == SPACE_ACTION) { SpaceAction *saction= (SpaceAction *)t->sa->spacedata.first; diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 2bc177c4330..574a045bc86 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -841,7 +841,7 @@ void postTrans (TransInfo *t) } /* postTrans can be called when nothing is selected, so data is NULL already */ - if (t->data) { + if (t->data && (t->spacetype != SPACE_SEQ)) { // XXX SEQ Exception is needed because of special_aftertrans_update using t->data int a; /* since ipokeys are optional on objects, we mallocced them per trans-data */ |