Merging r58475 through r58700 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / editors / space_sequencer / sequencer_buttons.c
index 21128408a97950ff6a65ee91f02d0b8624347bdc..36589984c785bdb827c0c94248fa13252dcb90c2 100644 (file)
@@ -67,6 +67,7 @@ void sequencer_buttons_register(ARegionType *art)
        pt = MEM_callocN(sizeof(PanelType), "spacetype sequencer panel gpencil");
        strcpy(pt->idname, "SEQUENCER_PT_gpencil");
        strcpy(pt->label, N_("Grease Pencil"));
+       strcpy(pt->translation_context, BLF_I18NCONTEXT_DEFAULT_BPYRNA);
        pt->draw_header = gpencil_panel_standard_header;
        pt->draw = gpencil_panel_standard;
        pt->poll = sequencer_grease_pencil_panel_poll;
@@ -75,7 +76,7 @@ void sequencer_buttons_register(ARegionType *art)
 
 /* **************** operator to open/close properties view ************* */
 
-static int sequencer_properties(bContext *C, wmOperator *UNUSED(op))
+static int sequencer_properties_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 {
        ScrArea *sa = CTX_wm_area(C);
        ARegion *ar = sequencer_has_buttons_region(sa);
@@ -92,7 +93,7 @@ void SEQUENCER_OT_properties(wmOperatorType *ot)
        ot->idname = "SEQUENCER_OT_properties";
        ot->description = "Open sequencer properties panel";
        
-       ot->exec = sequencer_properties;
+       ot->exec = sequencer_properties_toggle_exec;
        ot->poll = ED_operator_sequencer_active;
        
        /* flags */