maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #28465 from mrcdk/revert_process_and_drop_events_editor_dialog_step

Browse source 
Reverts the change made to the editor progress dialog
This commit is contained in:
Rémi Verschelde 2019-04-27 22:45:05 +02:00 committed by GitHub
parent 876c509a9d 20e442a9f6
commit a0180fa86e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
editor/progress_dialog.cpp
View file

@ -220,9 +220,8 @@ bool ProgressDialog::task_step(const String &p_task, const String &p_state, int
last_progress_tick = OS::get_singleton()->get_ticks_usec();
if (cancel_hb->is_visible()) {
OS::get_singleton()->force_process_input();
} else {
OS::get_singleton()->process_and_drop_events();
}
Main::iteration(); // this will not work on a lot of platforms, so it's only meant for the editor
return cancelled;
}