[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55656] trunk/blender: Code cleanup / Sequencer:

[Thomas Dinges]

Revision: 55656
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55656
Author:   dingto
Date:     2013-03-28 22:09:55 +0000 (Thu, 28 Mar 2013)
Log Message:
-----------
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. 

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
    trunk/blender/source/blender/makesdna/DNA_sequence_types.h
    trunk/blender/source/blender/makesrna/intern/rna_sequencer.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py	2013-03-28 20:58:14 UTC (rev 55655)
+++ trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py	2013-03-28 22:09:55 UTC (rev 55656)
@@ -514,9 +514,6 @@
                     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()

Modified: trunk/blender/source/blender/makesdna/DNA_sequence_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_sequence_types.h	2013-03-28 20:58:14 UTC (rev 55655)
+++ trunk/blender/source/blender/makesdna/DNA_sequence_types.h	2013-03-28 22:09:55 UTC (rev 55656)
@@ -314,7 +314,7 @@
 
 /* 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 ****************** */

Modified: trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequencer.c	2013-03-28 20:58:14 UTC (rev 55655)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequencer.c	2013-03-28 22:09:55 UTC (rev 55656)
@@ -2144,11 +2144,6 @@
 	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");