Merge pull request #24748 from timoschwarzer/no-target-fps-in-editor

Don't apply target_fps in editor
This commit is contained in:
Rémi Verschelde 2019-01-03 20:38:58 +01:00 committed by GitHub
commit bea0a579b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1932,7 +1932,7 @@ bool Main::iteration() {
}
int target_fps = Engine::get_singleton()->get_target_fps();
if (target_fps > 0) {
if (target_fps > 0 && !Engine::get_singleton()->is_editor_hint()) {
uint64_t time_step = 1000000L / target_fps;
target_ticks += time_step;
uint64_t current_ticks = OS::get_singleton()->get_ticks_usec();