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
path: root/source
diff options
context:
space:
mode:
authorPeter Schlaile <peter@schlaile.de>2008-02-03 22:22:34 +0300
committerPeter Schlaile <peter@schlaile.de>2008-02-03 22:22:34 +0300
commite9e4d843d2e534bd8d96b1a6d624b40d9c259db4 (patch)
tree29c6a53c75691f03c8dc6e6837e79cd0f0ec6c0a /source
parent54c1535606bcad7f09c82301ea5e11fbc5548d31 (diff)
== Sequencer ==
Silenced compiler warnings and possibly fixed crash on broken blend files.
Diffstat (limited to 'source')
-rw-r--r--source/blender/src/seqeffects.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/source/blender/src/seqeffects.c b/source/blender/src/seqeffects.c
index 8c98fd47e09..8958c0c0df6 100644
--- a/source/blender/src/seqeffects.c
+++ b/source/blender/src/seqeffects.c
@@ -3006,11 +3006,10 @@ struct SeqEffectHandle get_sequence_effect(Sequence * seq)
if (seq->type & SEQ_EFFECT) {
rval = get_sequence_effect_impl(seq->type);
- }
-
- if ((seq->flag & SEQ_EFFECT_NOT_LOADED) != 0) {
- rval.load(seq);
- seq->flag &= ~SEQ_EFFECT_NOT_LOADED;
+ if ((seq->flag & SEQ_EFFECT_NOT_LOADED) != 0) {
+ rval.load(seq);
+ seq->flag &= ~SEQ_EFFECT_NOT_LOADED;
+ }
}
return rval;
@@ -3022,11 +3021,10 @@ struct SeqEffectHandle get_sequence_blend(Sequence * seq)
if (seq->blend_mode != 0) {
rval = get_sequence_effect_impl(seq->blend_mode);
- }
-
- if ((seq->flag & SEQ_EFFECT_NOT_LOADED) != 0) {
- rval.load(seq);
- seq->flag &= ~SEQ_EFFECT_NOT_LOADED;
+ if ((seq->flag & SEQ_EFFECT_NOT_LOADED) != 0) {
+ rval.load(seq);
+ seq->flag &= ~SEQ_EFFECT_NOT_LOADED;
+ }
}
return rval;