diff options
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 10 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 2e3abfd9944..828c337d64d 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2397,7 +2397,7 @@ static int wm_handler_fileselect_do(bContext *C, CTX_wm_window_set(C, ctx_win); // wm_window_close() NULLs. /* Some operators expect a drawable context (for EVT_FILESELECT_EXEC) */ wm_window_make_drawable(wm, ctx_win); - /* Ensure correct cursor positon, otherwise, popups may close immediately after + /* Ensure correct cursor position, otherwise, popups may close immediately after * opening (UI_BLOCK_MOVEMOUSE_QUIT) */ wm_get_cursor_position(ctx_win, &ctx_win->eventstate->x, &ctx_win->eventstate->y); wm->winactive = ctx_win; /* Reports use this... */ diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 2b89426f083..a2e7f7fe935 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -2408,7 +2408,10 @@ void WM_OT_revert_mainfile(wmOperatorType *ot) ot->name = "Revert"; ot->idname = "WM_OT_revert_mainfile"; ot->description = "Reload the saved file"; + ot->invoke = WM_operator_confirm; + ot->exec = wm_revert_mainfile_exec; + ot->poll = wm_revert_mainfile_poll; RNA_def_boolean(ot->srna, "use_scripts", @@ -2416,9 +2419,6 @@ void WM_OT_revert_mainfile(wmOperatorType *ot) "Trusted Source", "Allow .blend file to execute scripts automatically, default available from " "system preferences"); - - ot->exec = wm_revert_mainfile_exec; - ot->poll = wm_revert_mainfile_poll; } /** \} */ @@ -2463,8 +2463,8 @@ void WM_OT_recover_last_session(wmOperatorType *ot) ot->name = "Recover Last Session"; ot->idname = "WM_OT_recover_last_session"; ot->description = "Open the last closed file (\"" BLENDER_QUIT_FILE "\")"; - ot->invoke = WM_operator_confirm; + ot->invoke = WM_operator_confirm; ot->exec = wm_recover_last_session_exec; } @@ -2506,8 +2506,8 @@ void WM_OT_recover_auto_save(wmOperatorType *ot) ot->idname = "WM_OT_recover_auto_save"; ot->description = "Open an automatically saved file to recover it"; - ot->exec = wm_recover_auto_save_exec; ot->invoke = wm_recover_auto_save_invoke; + ot->exec = wm_recover_auto_save_exec; WM_operator_properties_filesel(ot, FILE_TYPE_BLENDER, diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index bdc89f2bf2b..1e3c8a0aedd 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -288,8 +288,8 @@ void WM_init(bContext *C, int argc, const char **argv) const bool use_data = true; const bool use_userdef = true; - /* Studiolights needs to be init before we read the homefile, otherwise the versioning cannot - * find the default studiolight.*/ + /* Studio-lights needs to be init before we read the home-file, + * otherwise the versioning cannot find the default studio-light. */ BKE_studiolight_init(); wm_homefile_read(C, |