diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-08-19 13:35:22 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-08-19 13:35:22 +0400 |
| commit | e611c4756fa17c57855123dc2b5c2c2408b0d790 (patch) | |
| tree | 49e13409142aa576c0d37a0b683cefdf11ac1881 | |
| parent | 9b25a3bb2aea0447583a06e4bd89767cee1ee7cb (diff) | |
2.5: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22291:22625
| -rw-r--r-- | release/scripts/export_map.py | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/release/scripts/export_map.py b/release/scripts/export_map.py index aca02288c7a..2262ae3b89b 100644 --- a/release/scripts/export_map.py +++ b/release/scripts/export_map.py @@ -197,7 +197,7 @@ def is_tricyl_facegroup(faces): is the face group a tri cylinder Returens a bool, true if the faces make an extruded tri solid ''' - return False + # cube must have 5 faces if len(faces) != 5: print '1' diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 2ee95ed928e..078258092f7 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -2792,6 +2792,10 @@ void sequence_effect_speed_rebuild_map(Sequence * seq, int force) if (!(force || seq->len != v->length || !v->frameMap)) { return; } + if (!seq->seq1) { /* make coverity happy and check for (CID 598) + input strip ... */ + return; + } if (!v->frameMap || v->length != seq->len) { if (v->frameMap) MEM_freeN(v->frameMap); @@ -2807,7 +2811,7 @@ void sequence_effect_speed_rebuild_map(Sequence * seq, int force) /* if there is no IPO, try to make retiming easy by stretching the strip */ // XXX old animation system - seq - if (/*!seq->ipo &&*/ seq->seq1 && seq->seq1->enddisp != seq->seq1->start + if (/*!seq->ipo &&*/ seq->seq1->enddisp != seq->seq1->start && seq->seq1->len != 0) { fallback_fac = (float) seq->seq1->len / (float) (seq->seq1->enddisp - seq->seq1->start); |