Revert "UI: File Loading Waiting Feedback" #112682
|
@ -692,8 +692,6 @@ static void wm_file_read_post(bContext *C,
|
||||||
CTX_wm_window_set(C, static_cast<wmWindow *>(wm->windows.first));
|
CTX_wm_window_set(C, static_cast<wmWindow *>(wm->windows.first));
|
||||||
}
|
}
|
||||||
|
|
||||||
WM_cursor_wait(true);
|
|
||||||
|
|
||||||
#ifdef WITH_PYTHON
|
#ifdef WITH_PYTHON
|
||||||
if (is_startup_file) {
|
if (is_startup_file) {
|
||||||
/* On startup (by default), Python won't have been initialized.
|
/* On startup (by default), Python won't have been initialized.
|
||||||
|
@ -787,12 +785,6 @@ static void wm_file_read_post(bContext *C,
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef WITH_HEADLESS
|
|
||||||
if (!G.background) {
|
|
||||||
WM_redraw_windows(C);
|
|
||||||
}
|
|
||||||
#endif /* WITH_HEADLESS */
|
|
||||||
|
|
||||||
/* report any errors.
|
/* report any errors.
|
||||||
* currently disabled if addons aren't yet loaded */
|
* currently disabled if addons aren't yet loaded */
|
||||||
if (addons_loaded) {
|
if (addons_loaded) {
|
||||||
|
@ -826,8 +818,6 @@ static void wm_file_read_post(bContext *C,
|
||||||
WM_toolsystem_init(C);
|
WM_toolsystem_init(C);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
WM_cursor_wait(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void wm_read_callback_pre_wrapper(bContext *C, const char *filepath)
|
static void wm_read_callback_pre_wrapper(bContext *C, const char *filepath)
|
||||||
|
@ -1012,26 +1002,6 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports)
|
||||||
/* so we can get the error message */
|
/* so we can get the error message */
|
||||||
errno = 0;
|
errno = 0;
|
||||||
|
|
||||||
#ifndef WITH_HEADLESS
|
|
||||||
if (!G.background) {
|
|
||||||
wmWindowManager *wm = CTX_wm_manager(C);
|
|
||||||
wmWindow *win = CTX_wm_window(C);
|
|
||||||
bool win_was_null = (win == nullptr);
|
|
||||||
if (win_was_null) {
|
|
||||||
win = static_cast<wmWindow *>(wm->windows.first);
|
|
||||||
CTX_wm_window_set(C, win);
|
|
||||||
}
|
|
||||||
if (win != nullptr) {
|
|
||||||
/* Redraw to remove any open menus. */
|
|
||||||
WM_redraw_windows(C);
|
|
||||||
|
|
||||||
if (win_was_null) {
|
|
||||||
CTX_wm_window_set(C, nullptr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif /* WITH_HEADLESS */
|
|
||||||
|
|
||||||
WM_cursor_wait(true);
|
WM_cursor_wait(true);
|
||||||
|
|
||||||
/* first try to append data from exotic file formats... */
|
/* first try to append data from exotic file formats... */
|
||||||
|
@ -1097,7 +1067,6 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports)
|
||||||
bf_reports.duration.whole = PIL_check_seconds_timer() - bf_reports.duration.whole;
|
bf_reports.duration.whole = PIL_check_seconds_timer() - bf_reports.duration.whole;
|
||||||
file_read_reports_finalize(&bf_reports);
|
file_read_reports_finalize(&bf_reports);
|
||||||
|
|
||||||
WM_cursor_wait(true);
|
|
||||||
success = true;
|
success = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1202,8 +1171,6 @@ void wm_homefile_read_ex(bContext *C,
|
||||||
char filepath_startup[FILE_MAX];
|
char filepath_startup[FILE_MAX];
|
||||||
char filepath_userdef[FILE_MAX];
|
char filepath_userdef[FILE_MAX];
|
||||||
|
|
||||||
WM_cursor_wait(true);
|
|
||||||
|
|
||||||
/* When 'app_template' is set:
|
/* When 'app_template' is set:
|
||||||
* '{BLENDER_USER_CONFIG}/{app_template}' */
|
* '{BLENDER_USER_CONFIG}/{app_template}' */
|
||||||
char app_template_system[FILE_MAX];
|
char app_template_system[FILE_MAX];
|
||||||
|
@ -1521,8 +1488,6 @@ void wm_homefile_read_ex(bContext *C,
|
||||||
CTX_wm_window_set(C, nullptr);
|
CTX_wm_window_set(C, nullptr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
WM_cursor_wait(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wm_homefile_read(bContext *C,
|
void wm_homefile_read(bContext *C,
|
||||||
|
|
Loading…
Reference in New Issue