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>2013-02-18 07:36:10 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-02-18 07:36:10 +0400
commita0ede5be1de91beaf4bc23d4aea201a35845c6c0 (patch)
tree3183de72cfaf3d0be16e4372b30dc289b5c6f6f8 /source/blender/editors/space_sequencer
parentd45612aa412798d5529027afd068adc79b8465f1 (diff)
resolve build error in MSVC, was using a GNU C extension for ternary conditional.
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_edit.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index ab7a2f38744..7be2d51a3c0 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -842,7 +842,9 @@ static int cut_seq_list(Scene *scene, ListBase *slist, int cutframe,
Sequence *seqn = cut_seq(scene, seq, cutframe);
if (seqn) {
BLI_addtail(slist, seqn);
- seq_first_new = seq_first_new ?: seqn;
+ if (seq_first_new == NULL) {
+ seq_first_new = seqn;
+ }
}
}
else if (seq->enddisp <= cutframe) {
@@ -853,7 +855,9 @@ static int cut_seq_list(Scene *scene, ListBase *slist, int cutframe,
BLI_remlink(slist, seq);
BLI_addtail(slist, seq);
- seq_first_new = seq_first_new ?: seq;
+ if (seq_first_new == NULL) {
+ seq_first_new = seq;
+ }
}
}
seq = seq_next_iter;