Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-09-06 08:45:25 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-06 08:45:25 +0400
commit3bb17bd64ab4d9ab2e69ee487a4be4fc0fa8adb8 (patch)
tree5912f02fa9561eebe57c1268e7a1f19feb9e8b2f /source/blender/makesrna/intern/rna_sequencer_api.c
parent86dd087057f4300fb3ec82844697fb4ef17d2e0f (diff)
fix for crash in sequencer introduced with recent cache addition,
- running undo with metastrips would crash immediately. - freeing a strip without a scene would crash (clipboard does this).
Diffstat (limited to 'source/blender/makesrna/intern/rna_sequencer_api.c')
-rw-r--r--source/blender/makesrna/intern/rna_sequencer_api.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_sequencer_api.c b/source/blender/makesrna/intern/rna_sequencer_api.c
index 549868e5ed0..0445a7213d0 100644
--- a/source/blender/makesrna/intern/rna_sequencer_api.c
+++ b/source/blender/makesrna/intern/rna_sequencer_api.c
@@ -170,7 +170,7 @@ static Sequence *rna_Sequences_new_image(ID *id, Editing *ed, ReportList *report
if (seq->strip->stripdata->name[0] == '\0') {
BKE_report(reports, RPT_ERROR, "Sequences.new_image: unable to open image file");
BLI_remlink(&ed->seqbase, seq);
- BKE_sequence_free(scene, seq);
+ BKE_sequence_free(scene, seq, FALSE); /* cache won't have been generated */
return NULL;
}
@@ -315,7 +315,7 @@ static void rna_Sequences_remove(ID *id, Editing *ed, Sequence *seq)
Scene *scene = (Scene *)id;
BLI_remlink(&ed->seqbase, seq);
- BKE_sequence_free(scene, seq);
+ BKE_sequence_free(scene, seq, TRUE);
WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, scene);
}