diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-03-29 02:09:55 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-03-29 02:09:55 +0400 |
| commit | 63290beee19132f93094b90cfb6dd5d210756451 (patch) | |
| tree | 5899d60bff59d3acd353dfe0ace33ab59b460cfe | |
| parent | 93deb27dd4b4e12f118cd74ca5c70a485c19e81b (diff) | |
Code cleanup / Sequencer:
* Remove "use_frame_blend" from RNA and UI file, not used anywhere in the code, also mark SEQ_SPEED_BLEND as deprecated.
| -rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_sequence_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_sequencer.c | 5 |
3 files changed, 1 insertions, 9 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index ae9e0f72009..90ade0c8ccb 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -514,9 +514,6 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): layout.prop(strip, "speed_factor", text="Frame number") layout.prop(strip, "scale_to_length") - #doesn't work currently - #layout.prop(strip, "use_frame_blend") - elif strip.type == 'TRANSFORM': layout = self.layout col = layout.column() diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 455350d8310..d9057c45380 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -314,7 +314,7 @@ typedef struct SequencerScopes { /* SpeedControlVars->flags */ #define SEQ_SPEED_INTEGRATE 1 -#define SEQ_SPEED_BLEND 2 +/* #define SEQ_SPEED_BLEND 2 */ /* DEPRECATED */ #define SEQ_SPEED_COMPRESS_IPO_Y 4 /* ***************** SEQUENCE ****************** */ diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 475b3e614c1..ad87bd74292 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -2144,11 +2144,6 @@ static void rna_def_speed_control(StructRNA *srna) RNA_def_property_ui_text(prop, "Use as speed", "Interpret the value as speed instead of a frame number"); RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_update"); - prop = RNA_def_property(srna, "use_frame_blend", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flags", SEQ_SPEED_BLEND); - RNA_def_property_ui_text(prop, "Frame Blending", "Blend two frames into the target for a smoother result"); - RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_update"); - prop = RNA_def_property(srna, "scale_to_length", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SEQ_SPEED_COMPRESS_IPO_Y); RNA_def_property_ui_text(prop, "Scale to length", "Scale values from 0.0 to 1.0 to target sequence length"); |