aboutsummaryrefslogtreecommitdiff
path: root/scene/main/timer.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2014-10-12 02:13:22 -0300
committerJuan Linietsky2014-10-12 02:13:22 -0300
commit948fd83cdded7fed77ae5213101c1a2ece580434 (patch)
treea6953095dc4feaac1485c04b35039b85f1a95534 /scene/main/timer.cpp
parent37354da5b0dc1dc8dcfd9d844e593935311f4f8f (diff)
downloadgodot-948fd83cdded7fed77ae5213101c1a2ece580434.tar.gz
godot-948fd83cdded7fed77ae5213101c1a2ece580434.tar.zst
godot-948fd83cdded7fed77ae5213101c1a2ece580434.zip
Little Bits
-=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
Diffstat (limited to 'scene/main/timer.cpp')
-rw-r--r--scene/main/timer.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp
index 25d1c8530..deef9d587 100644
--- a/scene/main/timer.cpp
+++ b/scene/main/timer.cpp
@@ -36,8 +36,11 @@ void Timer::_notification(int p_what) {
case NOTIFICATION_READY: {
- if (autostart)
+ if (autostart) {
+ if (get_scene()->is_editor_hint() && get_scene()->get_edited_scene_root() && (get_scene()->get_edited_scene_root()==this || get_scene()->get_edited_scene_root()->is_a_parent_of(this)))
+ break;
start();
+ }
} break;
case NOTIFICATION_PROCESS: {