summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-01-03 20:38:58 +0100
committerGitHub <noreply@github.com>2019-01-03 20:38:58 +0100
commitbea0a579b754a778057a25ce902cdd90615f6f0c (patch)
treeecb218255a4faf6035965b10ba4cda7378aae83c
parent59c5b42076dd443ecc437277e936c9353f44e1b2 (diff)
parent8d79fea9694dad7433cb67a5079ae84e254e6848 (diff)
Merge pull request #24748 from timoschwarzer/no-target-fps-in-editor
Don't apply target_fps in editor
-rw-r--r--main/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp
index dcac2ff170..e0f9cfb9d9 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -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();