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:
authorJoshua Leung <aligorith@gmail.com>2009-02-09 07:39:25 +0300
committerJoshua Leung <aligorith@gmail.com>2009-02-09 07:39:25 +0300
commiteb848445fb44808aed86bc4238ab02c497c1eb2f (patch)
tree807946422493b46a3690262ddf46440ac00c533a /source/blender/editors/space_sequencer/sequencer_edit.c
parent52e1121669cdf4a0b23bbc41eb8d1d342c19ba87 (diff)
2.5 - Assorted View2D-Related Cleanups
* Removed Sequencer's own 'border zoom' tool. There is a generic one in View2D that should be used instead. * Changed the hotkey for View2D's version of borderzoom to Shift-B * Fixed a few hotkey mentions entries in old menus * Added set start/end frame operators for TimeLine. (SKEY and EKEY) * Fixed various issues in Graph Editor - channels area is now drawn wide enough to show the 'protect' toggles without needing to scroll - new Graph Editors have 'auto-snap' enabled by default
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_edit.c')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_edit.c66
1 files changed, 2 insertions, 64 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 8c70e1d9b2d..ea1b36af137 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -590,8 +590,8 @@ static void reload_sound_strip(Scene *scene, char *name)
static void reload_image_strip(Scene *scene, char *name)
{
Editing *ed= seq_give_editing(scene, FALSE);
- Sequence *seq, *seqact;
- SpaceFile *sfile;
+ Sequence *seq=NULL, *seqact;
+ SpaceFile *sfile=NULL;
Sequence *last_seq= get_last_seq(scene);
@@ -2392,65 +2392,3 @@ void SEQUENCER_OT_view_selected(wmOperatorType *ot)
/* flags */
ot->flag= OPTYPE_REGISTER;
}
-
-
-
-
-/* borderselect operator */
-static int sequencer_view_zoom_exec(bContext *C, wmOperator *op)
-{
- bScreen *sc= CTX_wm_screen(C);
- ScrArea *area= CTX_wm_area(C);
- View2D *v2d= UI_view2d_fromcontext(C);
- rcti rect;
- rctf rectf;
-
- int val;
- short mval[2];
-
- val= RNA_int_get(op->ptr, "event_type");
- rect.xmin= RNA_int_get(op->ptr, "xmin");
- rect.ymin= RNA_int_get(op->ptr, "ymin");
- rect.xmax= RNA_int_get(op->ptr, "xmax");
- rect.ymax= RNA_int_get(op->ptr, "ymax");
-
- mval[0]= rect.xmin;
- mval[1]= rect.ymin;
- UI_view2d_region_to_view(v2d, mval[0], mval[1], &rectf.xmin, &rectf.ymin);
- mval[0]= rect.xmax;
- mval[1]= rect.ymax;
- UI_view2d_region_to_view(v2d, mval[0], mval[1], &rectf.xmax, &rectf.ymax);
-
- v2d->cur= rectf;
- UI_view2d_curRect_validate(v2d);
- UI_view2d_sync(sc, area, v2d, V2D_LOCK_COPY);
-
- return OPERATOR_FINISHED;
-}
-
-
-/* ****** Border Select ****** */
-void SEQUENCER_OT_view_zoom(wmOperatorType *ot)
-{
- /* identifiers */
- ot->name= "View Zoom";
- ot->idname= "SEQUENCER_OT_view_zoom";
-
- /* api callbacks */
- ot->invoke= WM_border_select_invoke;
- ot->exec= sequencer_view_zoom_exec;
- ot->modal= WM_border_select_modal;
-
- ot->poll= ED_operator_sequencer_active;
-
- /* flags */
- ot->flag= OPTYPE_REGISTER;
-
- /* rna */
- RNA_def_int(ot->srna, "event_type", 0, INT_MIN, INT_MAX, "Event Type", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX);
-}
-