archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

== Sequencer ==

Browse Source 
Silently destroyed a null check in free_sequence in last commit,
getting old... :)
This commit is contained in:
Peter Schlaile
2008-02-03 19:10:19 +00:00
parent a9518afc67
commit 54c1535606
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/src/sequence.c
View File

@@ -114,7 +114,9 @@ void free_strip(Strip *strip)
return; return;
} }
MEM_freeN(strip->stripdata); if (strip->stripdata) {
MEM_freeN(strip->stripdata);
}
if (strip->proxy) { if (strip->proxy) {
MEM_freeN(strip->proxy); MEM_freeN(strip->proxy);
@@ -1021,6 +1023,10 @@ static int seq_proxy_get_fname(Sequence * seq, int cfra, char * name)
int frameno; int frameno;
char dir[FILE_MAXDIR]; char dir[FILE_MAXDIR];
if (!seq->strip->proxy) {
return FALSE;
}
if (seq->flag & SEQ_USE_PROXY_CUSTOM_DIR) { if (seq->flag & SEQ_USE_PROXY_CUSTOM_DIR) {
strcpy(dir, seq->strip->proxy->dir); strcpy(dir, seq->strip->proxy->dir);
} else { } else {
@@ -1056,11 +1062,6 @@ static int seq_proxy_get_fname(Sequence * seq, int cfra, char * name)
G.scene->r.size); G.scene->r.size);
} }
if (seq->strip->proxy == 0) {
return FALSE;
}
BLI_convertstringcode(name, G.sce, frameno); BLI_convertstringcode(name, G.sce, frameno);
strcat(name, ".jpg"); strcat(name, ".jpg");