[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15316] trunk/blender/source/blender/src: == Sequencer ==

[Peter Schlaile]

Revision: 15316
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15316
Author:   schlaile
Date:     2008-06-22 22:59:29 +0200 (Sun, 22 Jun 2008)

Log Message:
-----------
== Sequencer ==

Renamed Filter-Y to De-Interlace and moved F-Key to D-Key.
(Also added file reload on D-Key)

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_scene.c
    trunk/blender/source/blender/src/editseq.c
    trunk/blender/source/blender/src/space.c

Modified: trunk/blender/source/blender/src/buttons_scene.c
===================================================================
--- trunk/blender/source/blender/src/buttons_scene.c    2008-06-22 20:40:13 UTC 
(rev 15315)
+++ trunk/blender/source/blender/src/buttons_scene.c    2008-06-22 20:59:29 UTC 
(rev 15316)
@@ -900,7 +900,7 @@
                     "Convert input to float data");
 
        uiDefButBitI(block, TOG, SEQ_FILTERY, 
-                    B_SEQ_BUT_RELOAD_FILE, "FilterY",  
+                    B_SEQ_BUT_RELOAD_FILE, "De-Inter", 
                     170,110,80,19, &last_seq->flag, 
                     0.0, 21.0, 100, 0, 
                     "For video movies to remove fields");

Modified: trunk/blender/source/blender/src/editseq.c
===================================================================
--- trunk/blender/source/blender/src/editseq.c  2008-06-22 20:40:13 UTC (rev 
15315)
+++ trunk/blender/source/blender/src/editseq.c  2008-06-22 20:59:29 UTC (rev 
15316)
@@ -2634,12 +2634,13 @@
        ed= G.scene->ed;
        if(ed==0) return;
 
-       if(okee("Set FilterY")==0) return;
+       if(okee("Set Deinterlace")==0) return;
 
        WHILE_SEQ(ed->seqbasep) {
                if(seq->flag & SELECT) {
                        if(seq->type==SEQ_MOVIE) {
                                seq->flag |= SEQ_FILTERY;
+                               reload_sequence_new_file(seq);
                        }
 
                }

Modified: trunk/blender/source/blender/src/space.c
===================================================================
--- trunk/blender/source/blender/src/space.c    2008-06-22 20:40:13 UTC (rev 
15315)
+++ trunk/blender/source/blender/src/space.c    2008-06-22 20:59:29 UTC (rev 
15316)
@@ -4976,11 +4976,13 @@
                        }
                        break;
                case DKEY:
-                       if (G.qual == (LR_CTRLKEY|LR_SHIFTKEY))
+                       if (G.qual == (LR_CTRLKEY|LR_SHIFTKEY)) {
                                duplicate_marker();
-                       else if ((G.qual==LR_SHIFTKEY)) {
+                       } else if ((G.qual==LR_SHIFTKEY)) {
                                if(sseq->mainb) break;
                                add_duplicate_seq();
+                       } else if (G.qual == 0) {
+                               set_filter_seq();
                        }
                        break;
                case EKEY:
@@ -4988,10 +4990,6 @@
                        if((G.qual==0))
                                transform_seq('e', 0);
                        break;
-               case FKEY:
-                       if((G.qual==0))
-                               set_filter_seq();
-                       break;
                case GKEY:
                        if (G.qual & LR_CTRLKEY)
                                transform_markers('g', 0);


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs