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:
authorJacques Lucke <mail@jlucke.com>2018-10-18 16:43:06 +0300
committerJacques Lucke <mail@jlucke.com>2018-10-18 16:43:06 +0300
commit41216d5ad4c722e2ad9f15c968af454fc7566d5e (patch)
treef68fe3e1dd32a2d651b6678a1783e165ce2e70c8 /source/blender/blenkernel/intern/sequencer.c
parentcfdd902d2d5d560262d1218861ad1a4469c5259f (diff)
Cleanup: Remove more #if 0 blocks
Continuation of https://developer.blender.org/D3802 Reviewers: brecht Differential Revision: https://developer.blender.org/D3808
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r--source/blender/blenkernel/intern/sequencer.c44
1 files changed, 0 insertions, 44 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index e5aa9b4915e..416e0ad59c1 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -120,19 +120,6 @@ ListBase seqbase_clipboard;
int seqbase_clipboard_frame;
SequencerDrawView sequencer_view3d_cb = NULL; /* NULL in background mode */
-#if 0 /* unused function */
-static void printf_strip(Sequence *seq)
-{
- fprintf(stderr, "name: '%s', len:%d, start:%d, (startofs:%d, endofs:%d), "
- "(startstill:%d, endstill:%d), machine:%d, (startdisp:%d, enddisp:%d)\n",
- seq->name, seq->len, seq->start, seq->startofs, seq->endofs, seq->startstill, seq->endstill, seq->machine,
- seq->startdisp, seq->enddisp);
-
- fprintf(stderr, "\tseq_tx_set_final_left: %d %d\n\n", seq_tx_get_final_left(seq, 0),
- seq_tx_get_final_right(seq, 0));
-}
-#endif
-
static void sequencer_state_init(SeqRenderState *state)
{
state->scene_parents = NULL;
@@ -1596,12 +1583,8 @@ static void seq_open_anim_file(Scene *scene, Sequence *seq, bool openfile)
}
if (sanim->anim) {
-#if 0
- seq_anim_add_suffix(scene, sanim->anim, i);
-#else
/* we already have the suffix */
IMB_suffix_anim(sanim->anim, suffix);
-#endif
}
else {
if (openfile) {
@@ -3749,14 +3732,6 @@ static ImBuf *seq_render_strip_stack(
return NULL;
}
-#if 0 /* commentind since this breaks keyframing, since it resets the value on draw */
- if (scene->r.cfra != cfra) {
- /* XXX for prefetch and overlay offset!..., very bad!!! */
- AnimData *adt = BKE_animdata_from_id(&scene->id);
- BKE_animsys_evaluate_animdata(scene, &scene->id, adt, cfra, ADT_RECALC_ANIM);
- }
-#endif
-
out = BKE_sequencer_cache_get(context, seq_arr[count - 1], cfra, SEQ_STRIPELEM_IBUF_COMP);
if (out) {
@@ -4375,16 +4350,6 @@ void BKE_sequence_tx_handle_xlimits(Sequence *seq, int leftflag, int rightflag)
if (BKE_sequence_tx_get_final_left(seq, false) >= seq_tx_get_end(seq)) {
BKE_sequence_tx_set_final_left(seq, seq_tx_get_end(seq) - 1);
}
-
- /* dosnt work now - TODO */
-#if 0
- if (seq_tx_get_start(seq) >= seq_tx_get_final_right(seq, 0)) {
- int ofs;
- ofs = seq_tx_get_start(seq) - seq_tx_get_final_right(seq, 0);
- seq->start -= ofs;
- seq_tx_set_final_left(seq, seq_tx_get_final_left(seq, 0) + ofs);
- }
-#endif
}
}
@@ -5253,11 +5218,6 @@ Sequence *BKE_sequencer_add_sound_strip(bContext *C, ListBase *seqbasep, SeqLoad
if (sound->playback_handle == NULL) {
BKE_libblock_free(bmain, sound);
-#if 0
- if (op)
- BKE_report(op->reports, RPT_ERROR, "Unsupported audio format");
-#endif
-
return NULL;
}
@@ -5265,10 +5225,6 @@ Sequence *BKE_sequencer_add_sound_strip(bContext *C, ListBase *seqbasep, SeqLoad
if (info.specs.channels == AUD_CHANNELS_INVALID) {
BKE_libblock_free(bmain, sound);
-#if 0
- if (op)
- BKE_report(op->reports, RPT_ERROR, "Unsupported audio format");
-#endif
return NULL;
}