aboutsummaryrefslogtreecommitdiff
path: root/scene/main/timer.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2017-08-20 12:55:46 -0300
committerGitHub2017-08-20 12:55:46 -0300
commit541fdffc0ab2115238fe9cedbf1c088b15f11fdf (patch)
tree187c5d0278e5075907fef8a86b4d00d6a0b7161a /scene/main/timer.cpp
parent831e21e89ba0275b43b6a351e538256b8ce715a3 (diff)
parent90b8a5b71ef79e0339826507c4b290f0c51b7cd2 (diff)
downloadgodot-541fdffc0ab2115238fe9cedbf1c088b15f11fdf.tar.gz
godot-541fdffc0ab2115238fe9cedbf1c088b15f11fdf.tar.zst
godot-541fdffc0ab2115238fe9cedbf1c088b15f11fdf.zip
Merge pull request #10319 from neikeq/pr-engine-editor-hint
Adds Engine::is_editor_hint() method
Diffstat (limited to '')
-rwxr-xr-xscene/main/timer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp
index a61d1100e..06801ee49 100755
--- a/scene/main/timer.cpp
+++ b/scene/main/timer.cpp
@@ -29,6 +29,8 @@
/*************************************************************************/
#include "timer.h"
+#include "engine.h"
+
void Timer::_notification(int p_what) {
switch (p_what) {
@@ -37,7 +39,7 @@ void Timer::_notification(int p_what) {
if (autostart) {
#ifdef TOOLS_ENABLED
- if (get_tree()->is_editor_hint() && get_tree()->get_edited_scene_root() && (get_tree()->get_edited_scene_root() == this || get_tree()->get_edited_scene_root()->is_a_parent_of(this)))
+ if (Engine::get_singleton()->is_editor_hint() && get_tree()->get_edited_scene_root() && (get_tree()->get_edited_scene_root() == this || get_tree()->get_edited_scene_root()->is_a_parent_of(this)))
break;
#endif
start();