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:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-02-01 12:35:16 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-02-01 12:35:16 +0400
commited0d2b5e9205fc99ed38957f01acaa62c3811333 (patch)
tree1a5ec12aea52b158711fd0666ef4465686de250a /source/blender/editors
parent386671224833baac0f3ef60d77a1caa8c0d45625 (diff)
Fix #30028: VSE Paste Strip Crash
Crash was caused by attempting to create strip text from a missed sound datablock. Actual error happened when this sound datablock was missed, but crash isn't nice anyway and there were no way to repair scene.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 511f1524fae..7bc8600c11c 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -553,7 +553,10 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float
BLI_snprintf(str, sizeof(str), "%d | %s", seq->len, name);
}
else if (seq->type == SEQ_SOUND) {
- BLI_snprintf(str, sizeof(str), "%d | %s: %s", seq->len, name, seq->sound->name);
+ if(seq->sound)
+ BLI_snprintf(str, sizeof(str), "%d | %s: %s", seq->len, name, seq->sound->name);
+ else
+ BLI_snprintf(str, sizeof(str), "%d | %s", seq->len, name);
}
else if (seq->type == SEQ_MOVIE) {
BLI_snprintf(str, sizeof(str), "%d | %s: %s%s", seq->len, name, seq->strip->dir, seq->strip->stripdata->name);