diff options
| author | Peter Schlaile <peter@schlaile.de> | 2012-03-21 22:02:29 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2012-03-21 22:02:29 +0400 |
| commit | d8623da305b81523f938b0cc0ebc942670cf0b97 (patch) | |
| tree | 0d1fdf1b71b5853b3642e2df8daae8ccf73686d9 /release | |
| parent | ee1dc842397efc37d09778dae2c61ba23831b205 (diff) | |
== Sequencer ==
This adds movieclip input support to the sequencer, thereby making
undistorted and stabilized footage available without a seperate render step.
Also: removes some old cruft code from the sequencer:
* new_tstripdata wasn't used anymore
* StripElems were allocated for SCENE strips on full length, wasting memory
Added a comment, that hopefully makes things a little bit clearer:
StripElems are *only* usefull for MOVIE + IMAGE strips for all other strip
types one can set this pointer to NULL. (If that should cause otherwise
problems, then the code that doesn't check for NULL is to blame!)
Diffstat (limited to 'release')
6 files changed, 22 insertions, 2 deletions
diff --git a/release/scripts/presets/interface_theme/back_to_black.xml b/release/scripts/presets/interface_theme/back_to_black.xml index 76c30bb293b..27ee9f8ca21 100644 --- a/release/scripts/presets/interface_theme/back_to_black.xml +++ b/release/scripts/presets/interface_theme/back_to_black.xml @@ -412,6 +412,7 @@ keyframe="#ff8500" meta_strip="#6d9183" movie_strip="#516987" + movieclip_strip="#20208f" plugin_strip="#7e7e50" scene_strip="#4e983e" transition_strip="#a25f6f" diff --git a/release/scripts/presets/interface_theme/blender_24x.xml b/release/scripts/presets/interface_theme/blender_24x.xml index 046a05982cf..5173244a167 100644 --- a/release/scripts/presets/interface_theme/blender_24x.xml +++ b/release/scripts/presets/interface_theme/blender_24x.xml @@ -412,6 +412,7 @@ keyframe="#ff8500" meta_strip="#6d9183" movie_strip="#516987" + movieclip_strip="#20208f" plugin_strip="#7e7e50" scene_strip="#4e983e" transition_strip="#a25f6f" diff --git a/release/scripts/presets/interface_theme/elsyiun.xml b/release/scripts/presets/interface_theme/elsyiun.xml index 270dbfd19a3..8720aeff727 100644 --- a/release/scripts/presets/interface_theme/elsyiun.xml +++ b/release/scripts/presets/interface_theme/elsyiun.xml @@ -412,6 +412,7 @@ keyframe="#ff8500" meta_strip="#6d9183" movie_strip="#516987" + movieclip_strip="#20208f" plugin_strip="#7e7e50" scene_strip="#4e983e" transition_strip="#a25f6f" diff --git a/release/scripts/presets/interface_theme/hexagon.xml b/release/scripts/presets/interface_theme/hexagon.xml index 07c05656c26..94648e258a1 100644 --- a/release/scripts/presets/interface_theme/hexagon.xml +++ b/release/scripts/presets/interface_theme/hexagon.xml @@ -412,6 +412,7 @@ keyframe="#ff8500" meta_strip="#6d9183" movie_strip="#516987" + movieclip_strip="#20208f" plugin_strip="#7e7e50" scene_strip="#4e983e" transition_strip="#a25f6f" diff --git a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml index 40e311c552f..bea98620b7f 100644 --- a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml +++ b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml @@ -412,6 +412,7 @@ keyframe="#f47421" meta_strip="#6d9183" movie_strip="#516987" + movieclip_strip="#20208f" plugin_strip="#7e7e50" scene_strip="#4e983e" transition_strip="#a25f6f" diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 723fbd2e3d4..2848b49ef2b 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -185,6 +185,12 @@ class SEQUENCER_MT_add(Menu): else: layout.operator_menu_enum("sequencer.scene_strip_add", "scene", text="Scene...") + if len(bpy.data.movieclips) > 10: + layout.operator_context = 'INVOKE_DEFAULT' + layout.operator("sequencer.movieclip_strip_add", text="Clips...") + else: + layout.operator_menu_enum("sequencer.movieclip_strip_add", "clip", text="Clip...") + layout.operator("sequencer.movie_strip_add", text="Movie") layout.operator("sequencer.image_strip_add", text="Image") layout.operator("sequencer.sound_strip_add", text="Sound") @@ -534,7 +540,7 @@ class SEQUENCER_PT_input(SequencerButtonsPanel, Panel): if not strip: return False - return strip.type in {'MOVIE', 'IMAGE', 'SCENE', 'META', + return strip.type in {'MOVIE', 'IMAGE', 'SCENE', 'MOVIECLIP', 'META', 'ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER', 'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP', 'PLUGIN', @@ -697,7 +703,7 @@ class SEQUENCER_PT_filter(SequencerButtonsPanel, Panel): if not strip: return False - return strip.type in {'MOVIE', 'IMAGE', 'SCENE', 'META', + return strip.type in {'MOVIE', 'IMAGE', 'SCENE', 'MOVIECLIP', 'META', 'ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER', 'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP', 'PLUGIN', @@ -713,6 +719,15 @@ class SEQUENCER_PT_filter(SequencerButtonsPanel, Panel): col.label(text="Video:") col.prop(strip, "strobe") + if strip.type == 'MOVIECLIP': + col = layout.column() + col.label(text="Tracker:") + col.prop(strip, "stabilize2d") + + col = layout.column() + col.label(text="Distortion:") + col.prop(strip, "undistort") + row = layout.row() row.label(text="Flip:") row.prop(strip, "use_flip_x", text="X") |