Revision: 28416
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28416
Author: schlaile
Date: 2010-04-25 17:39:04 +0200 (Sun, 25 Apr 2010)
Log Message:
-----------
== Sequencer ==
Forgot some changes for multicam support.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_sequencer.py
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
Modified: trunk/blender/release/scripts/ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/ui/space_sequencer.py 2010-04-25 15:24:18 UTC
(rev 28415)
+++ trunk/blender/release/scripts/ui/space_sequencer.py 2010-04-25 15:39:04 UTC
(rev 28416)
@@ -217,6 +217,7 @@
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 @@
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,8 +447,10 @@
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':
col.prop(strip, "speed_fader", text="Speed fader")
@@ -501,7 +505,8 @@
'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 @@
'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 @@
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)
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-04-25
15:24:18 UTC (rev 28415)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-04-25
15:39:04 UTC (rev 28416)
@@ -795,6 +795,7 @@
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 @@
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;
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2010-04-25 15:24:18 UTC (rev 28415)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2010-04-25 15:39:04 UTC (rev 28416)
@@ -2539,9 +2539,9 @@
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) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
