forked from bartvdbraak/blender
== Sequencer ==
Forgot some changes for multicam support.
This commit is contained in:
parent
93f420b666
commit
4f6e3dad47
@ -217,6 +217,7 @@ class SEQUENCER_MT_add_effect(bpy.types.Menu):
|
||||
layout.operator("sequencer.effect_strip_add", text="Transform").type = 'TRANSFORM'
|
||||
layout.operator("sequencer.effect_strip_add", text="Color").type = 'COLOR'
|
||||
layout.operator("sequencer.effect_strip_add", text="Speed Control").type = 'SPEED'
|
||||
layout.operator("sequencer.effect_strip_add", text="Multicam Selector").type = 'MULTICAM'
|
||||
|
||||
|
||||
class SEQUENCER_MT_strip(bpy.types.Menu):
|
||||
@ -402,7 +403,8 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel):
|
||||
return strip.type in ('ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER',
|
||||
'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP',
|
||||
'PLUGIN',
|
||||
'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', 'SPEED')
|
||||
'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', 'SPEED',
|
||||
'MULTICAM')
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
@ -445,7 +447,9 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel):
|
||||
|
||||
elif strip.type == 'TRANSFORM':
|
||||
self.draw_panel_transform(strip)
|
||||
|
||||
|
||||
elif strip.type == "MULTICAM":
|
||||
layout.prop(strip, "multicam_source")
|
||||
|
||||
col = layout.column(align=True)
|
||||
if strip.type == 'SPEED':
|
||||
@ -501,7 +505,8 @@ class SEQUENCER_PT_input(SequencerButtonsPanel):
|
||||
'ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER',
|
||||
'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP',
|
||||
'PLUGIN',
|
||||
'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', 'SPEED')
|
||||
'WIPE', 'GLOW', 'TRANSFORM', 'COLOR',
|
||||
'MULTICAM','SPEED')
|
||||
|
||||
def draw_filename(self, context):
|
||||
pass
|
||||
@ -683,7 +688,8 @@ class SEQUENCER_PT_filter(SequencerButtonsPanel):
|
||||
'ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER',
|
||||
'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP',
|
||||
'PLUGIN',
|
||||
'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', 'SPEED')
|
||||
'WIPE', 'GLOW', 'TRANSFORM', 'COLOR',
|
||||
'MULTICAM', 'SPEED')
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
@ -738,7 +744,7 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel):
|
||||
if not strip:
|
||||
return False
|
||||
|
||||
return strip.type in ('MOVIE', 'IMAGE', 'SCENE', 'META')
|
||||
return strip.type in ('MOVIE', 'IMAGE', 'SCENE', 'META', 'MULTICAM')
|
||||
|
||||
def draw_header(self, context):
|
||||
strip = act_strip(context)
|
||||
|
@ -795,6 +795,7 @@ static char *give_seqname_by_type(int type)
|
||||
case SEQ_GLOW: return "Glow";
|
||||
case SEQ_TRANSFORM: return "Transform";
|
||||
case SEQ_COLOR: return "Color";
|
||||
case SEQ_MULTICAM: return "Multicam";
|
||||
case SEQ_SPEED: return "Speed";
|
||||
default:
|
||||
return 0;
|
||||
@ -3449,7 +3450,8 @@ void seq_tx_set_final_right(Sequence *seq, int val)
|
||||
since they work a bit differently to normal image seq's (during transform) */
|
||||
int seq_single_check(Sequence *seq)
|
||||
{
|
||||
if ( seq->len==1 && (seq->type == SEQ_IMAGE || seq->type == SEQ_COLOR))
|
||||
if ( seq->len==1 && (seq->type == SEQ_IMAGE || seq->type == SEQ_COLOR
|
||||
|| seq->type == SEQ_MULTICAM))
|
||||
return 1;
|
||||
else
|
||||
return 0;
|
||||
|
@ -2539,9 +2539,9 @@ static int sequencer_swap_exec(bContext *C, wmOperator *op)
|
||||
if(seq) {
|
||||
|
||||
/* disallow effect strips */
|
||||
if ((seq->type!=SEQ_COLOR) && (seq->effectdata || seq->seq1 || seq->seq2 || seq->seq3))
|
||||
if (get_sequence_effect_num_inputs(seq->type) >= 1 && (seq->effectdata || seq->seq1 || seq->seq2 || seq->seq3))
|
||||
return OPERATOR_CANCELLED;
|
||||
if ((active_seq->type!=SEQ_COLOR) && (active_seq->effectdata || active_seq->seq1 || active_seq->seq2 || active_seq->seq3))
|
||||
if ((get_sequence_effect_num_inputs(active_seq->type) >= 1) && (active_seq->effectdata || active_seq->seq1 || active_seq->seq2 || active_seq->seq3))
|
||||
return OPERATOR_CANCELLED;
|
||||
|
||||
switch (side) {
|
||||
|
Loading…
Reference in New Issue
Block a user