diff options
Diffstat (limited to 'source/blender/editors/space_info')
-rw-r--r-- | source/blender/editors/space_info/info_ops.c | 24 | ||||
-rw-r--r-- | source/blender/editors/space_info/space_info.c | 18 |
2 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c index 51767d3e006..aeb32cda6bd 100644 --- a/source/blender/editors/space_info/info_ops.c +++ b/source/blender/editors/space_info/info_ops.c @@ -73,7 +73,7 @@ static int pack_all_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int pack_all_invoke(bContext *C, wmOperator *op, wmEvent *event) +static int pack_all_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) { Main *bmain= CTX_data_main(C); Image *ima; @@ -133,7 +133,7 @@ static int unpack_all_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int unpack_all_invoke(bContext *C, wmOperator *op, wmEvent *event) +static int unpack_all_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) { Main *bmain= CTX_data_main(C); uiPopupMenu *pup; @@ -184,14 +184,14 @@ void FILE_OT_unpack_all(wmOperatorType *ot) /********************* make paths relative operator *********************/ -static int make_paths_relative_exec(bContext *C, wmOperator *op) +static int make_paths_relative_exec(bContext *UNUSED(C), wmOperator *op) { if(!G.relbase_valid) { BKE_report(op->reports, RPT_WARNING, "Can't set relative paths with an unsaved blend file."); return OPERATOR_CANCELLED; } - makeFilesRelative(G.sce, op->reports); + makeFilesRelative(G.main->name, op->reports); return OPERATOR_FINISHED; } @@ -211,14 +211,14 @@ void FILE_OT_make_paths_relative(wmOperatorType *ot) /********************* make paths absolute operator *********************/ -static int make_paths_absolute_exec(bContext *C, wmOperator *op) +static int make_paths_absolute_exec(bContext *UNUSED(C), wmOperator *op) { if(!G.relbase_valid) { BKE_report(op->reports, RPT_WARNING, "Can't set absolute paths with an unsaved blend file."); return OPERATOR_CANCELLED; } - makeFilesAbsolute(G.sce, op->reports); + makeFilesAbsolute(G.main->name, op->reports); return OPERATOR_FINISHED; } @@ -237,14 +237,14 @@ void FILE_OT_make_paths_absolute(wmOperatorType *ot) /********************* report missing files operator *********************/ -static int report_missing_files_exec(bContext *C, wmOperator *op) +static int report_missing_files_exec(bContext *UNUSED(C), wmOperator *op) { char txtname[24]; /* text block name */ txtname[0] = '\0'; /* run the missing file check */ - checkMissingFiles(G.sce, op->reports); + checkMissingFiles(G.main->name, op->reports); return OPERATOR_FINISHED; } @@ -264,18 +264,18 @@ void FILE_OT_report_missing_files(wmOperatorType *ot) /********************* find missing files operator *********************/ -static int find_missing_files_exec(bContext *C, wmOperator *op) +static int find_missing_files_exec(bContext *UNUSED(C), wmOperator *op) { char *path; path= RNA_string_get_alloc(op->ptr, "filepath", NULL, 0); - findMissingFiles(path, G.sce); + findMissingFiles(path, G.main->name); MEM_freeN(path); return OPERATOR_FINISHED; } -static int find_missing_files_invoke(bContext *C, wmOperator *op, wmEvent *event) +static int find_missing_files_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) { /* XXX file open button text "Find Missing Files" */ WM_event_add_fileselect(C, op); @@ -313,7 +313,7 @@ void FILE_OT_find_missing_files(wmOperatorType *ot) #define ERROR_TIMEOUT 10.0 #define ERROR_COLOR_TIMEOUT 6.0 #define COLLAPSE_TIMEOUT 0.2 -static int update_reports_display_invoke(bContext *C, wmOperator *op, wmEvent *event) +static int update_reports_display_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *event) { wmWindowManager *wm= CTX_wm_manager(C); ReportList *reports= CTX_wm_reports(C); diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c index b47c8e8d189..5173621d9c1 100644 --- a/source/blender/editors/space_info/space_info.c +++ b/source/blender/editors/space_info/space_info.c @@ -55,7 +55,7 @@ /* ******************** default callbacks for info space ***************** */ -static SpaceLink *info_new(const bContext *C) +static SpaceLink *info_new(const bContext *UNUSED(C)) { ARegion *ar; SpaceInfo *sinfo; @@ -80,7 +80,7 @@ static SpaceLink *info_new(const bContext *C) } /* not spacelink itself */ -static void info_free(SpaceLink *sl) +static void info_free(SpaceLink *UNUSED(sl)) { // SpaceInfo *sinfo= (SpaceInfo*) sl; @@ -88,7 +88,7 @@ static void info_free(SpaceLink *sl) /* spacetype; init callback */ -static void info_init(struct wmWindowManager *wm, ScrArea *sa) +static void info_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(sa)) { } @@ -105,11 +105,11 @@ static SpaceLink *info_duplicate(SpaceLink *sl) /* add handlers, stuff you only do once or on area/region changes */ -static void info_main_area_init(wmWindowManager *wm, ARegion *ar) +static void info_main_area_init(wmWindowManager *UNUSED(wm), ARegion *UNUSED(ar)) { } -static void info_main_area_draw(const bContext *C, ARegion *ar) +static void info_main_area_draw(const bContext *UNUSED(C), ARegion *UNUSED(ar)) { /* clear and setup matrix */ @@ -137,7 +137,7 @@ void info_keymap(struct wmKeyConfig *keyconf) } /* add handlers, stuff you only do once or on area/region changes */ -static void info_header_area_init(wmWindowManager *wm, ARegion *ar) +static void info_header_area_init(wmWindowManager *UNUSED(wm), ARegion *ar) { ED_region_header_init(ar); } @@ -147,7 +147,7 @@ static void info_header_area_draw(const bContext *C, ARegion *ar) ED_region_header(C, ar); } -static void info_main_area_listener(ARegion *ar, wmNotifier *wmn) +static void info_main_area_listener(ARegion *UNUSED(ar), wmNotifier *UNUSED(wmn)) { /* context changes */ } @@ -179,7 +179,7 @@ static void info_header_listener(ARegion *ar, wmNotifier *wmn) } -static void recent_files_menu(const bContext *C, Menu *menu) +static void recent_files_menu_draw(const bContext *UNUSED(C), Menu *menu) { struct RecentFile *recent; uiLayout *layout= menu->layout; @@ -200,7 +200,7 @@ void recent_files_menu_register() mt= MEM_callocN(sizeof(MenuType), "spacetype info menu recent files"); strcpy(mt->idname, "INFO_MT_file_open_recent"); strcpy(mt->label, "Open Recent..."); - mt->draw= recent_files_menu; + mt->draw= recent_files_menu_draw; WM_menutype_add(mt); } |