Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Schlaile <peter@schlaile.de>2008-06-23 00:59:29 +0400
committerPeter Schlaile <peter@schlaile.de>2008-06-23 00:59:29 +0400
commitd229db61e9f7e7e25a2c9c5cb5f4a8ce1623cc4d (patch)
tree07edb0caaee0be249f3b6a5ad71e866eb071c92e /source/blender/src
parentdac3434b03976b101435572559ebba7a6d1fc862 (diff)
== Sequencer ==
Renamed Filter-Y to De-Interlace and moved F-Key to D-Key. (Also added file reload on D-Key)
Diffstat (limited to 'source/blender/src')
-rw-r--r--source/blender/src/buttons_scene.c2
-rw-r--r--source/blender/src/editseq.c3
-rw-r--r--source/blender/src/space.c10
3 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index 5ab4e5b6741..1c98950080a 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -900,7 +900,7 @@ static void seq_panel_filter_video()
"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");
diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c
index fb0fac4489d..b9351f82d1e 100644
--- a/source/blender/src/editseq.c
+++ b/source/blender/src/editseq.c
@@ -2634,12 +2634,13 @@ void set_filter_seq(void)
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);
}
}
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index c49486a6294..585f6b59ceb 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -4976,11 +4976,13 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
}
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 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
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);