diff options
| author | Peter Schlaile <peter@schlaile.de> | 2008-02-03 22:10:19 +0300 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2008-02-03 22:10:19 +0300 |
| commit | 54c1535606bcad7f09c82301ea5e11fbc5548d31 (patch) | |
| tree | 57c948c8e92ecf64cefc8964af3e23e980442afa /source | |
| parent | a9518afc67d1350b2bdf369dd5be891956ddb5f1 (diff) | |
== Sequencer ==
Silently destroyed a null check in free_sequence in last commit,
getting old... :)
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/sequence.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c index 8ff72005732..460c4859b8c 100644 --- a/source/blender/src/sequence.c +++ b/source/blender/src/sequence.c @@ -114,7 +114,9 @@ void free_strip(Strip *strip) return; } - MEM_freeN(strip->stripdata); + if (strip->stripdata) { + MEM_freeN(strip->stripdata); + } if (strip->proxy) { MEM_freeN(strip->proxy); @@ -1021,6 +1023,10 @@ static int seq_proxy_get_fname(Sequence * seq, int cfra, char * name) int frameno; char dir[FILE_MAXDIR]; + if (!seq->strip->proxy) { + return FALSE; + } + if (seq->flag & SEQ_USE_PROXY_CUSTOM_DIR) { strcpy(dir, seq->strip->proxy->dir); } else { @@ -1056,11 +1062,6 @@ static int seq_proxy_get_fname(Sequence * seq, int cfra, char * name) G.scene->r.size); } - if (seq->strip->proxy == 0) { - return FALSE; - } - - BLI_convertstringcode(name, G.sce, frameno); strcat(name, ".jpg"); |