[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54621] trunk/blender/source/blender/ editors/space_sequencer/sequencer_edit.c: resolve build error in MSVC, was using a GNU C extension for ternary conditional.
Campbell Barton
ideasman42 at gmail.com
Mon Feb 18 04:36:13 CET 2013
Revision: 54621
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54621
Author: campbellbarton
Date: 2013-02-18 03:36:10 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
resolve build error in MSVC, was using a GNU C extension for ternary conditional.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2013-02-18 02:36:36 UTC (rev 54620)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2013-02-18 03:36:10 UTC (rev 54621)
@@ -842,7 +842,9 @@
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 @@
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;
More information about the Bf-blender-cvs
mailing list