Differential D1096 Diff 3479 source/blender/makesrna/intern/rna_sequencer.c

Changeset View

Standalone View

Context not available.
	}	}

	if (BKE_sequence_test_overlap(seqbase, seq)) {	if (BKE_sequence_test_overlap(seqbase, seq)) {
	BKE_sequence_base_shuffle(seqbase, seq, scene); /* XXX - BROKEN!, uses context seqbasep */	BKE_sequence_base_shuffle(seqbase, seq, scene, SEQ_CHANNEL_INC); /* XXX - BROKEN!, uses context seqbasep */
	}	}
	BKE_sequencer_sort(scene);	BKE_sequencer_sort(scene);
	}	}
Context not available.
	Scene scene = (Scene )ptr->id.data;	Scene scene = (Scene )ptr->id.data;
	Editing *ed = BKE_sequencer_editing_get(scene, false);	Editing *ed = BKE_sequencer_editing_get(scene, false);
	ListBase *seqbase = BKE_sequence_seqbase(&ed->seqbase, seq);	ListBase *seqbase = BKE_sequence_seqbase(&ed->seqbase, seq);

	seq->machine = value;

		int channel_delta = (value >= seq->machine) ? SEQ_CHANNEL_INC : SEQ_CHANNEL_DEC; // check channel increment or decrement
		seq->machine = value;

	if (BKE_sequence_test_overlap(seqbase, seq)) {	if (BKE_sequence_test_overlap(seqbase, seq)) {
	BKE_sequence_base_shuffle(seqbase, seq, scene); /* XXX - BROKEN!, uses context seqbasep */	BKE_sequence_base_shuffle(seqbase, seq, scene, channel_delta); /* XXX - BROKEN!, uses context seqbasep */
	}	}
	BKE_sequencer_sort(scene);	BKE_sequencer_sort(scene);
	}	}
Context not available.