diff options
| author | Juan Linietsky | 2015-06-01 23:35:23 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-06-01 23:35:23 -0300 |
| commit | 0e1510214a7585d5446f06344468ab52298cfa81 (patch) | |
| tree | 6856216b802c613f4c4beff48ad1cbc127171bc1 | |
| parent | 5900e7f589d50268d49e2e67d3a498d1b01fe03a (diff) | |
| download | godot-0e1510214a7585d5446f06344468ab52298cfa81.tar.gz godot-0e1510214a7585d5446f06344468ab52298cfa81.tar.zst godot-0e1510214a7585d5446f06344468ab52298cfa81.zip | |
small fixes
| -rw-r--r-- | demos/2d/motion/engine.cfg | 1 | ||||
| -rw-r--r-- | main/main.cpp | 4 | ||||
| -rw-r--r-- | scene/animation/animation_player.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/demos/2d/motion/engine.cfg b/demos/2d/motion/engine.cfg index 064de6b33..cf16105b1 100644 --- a/demos/2d/motion/engine.cfg +++ b/demos/2d/motion/engine.cfg @@ -2,3 +2,4 @@ name="Motion Test" main_scene="res://motion.scn" + diff --git a/main/main.cpp b/main/main.cpp index f826b3621..c02f90e70 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1320,8 +1320,8 @@ bool Main::iteration() { double step=(double)ticks_elapsed / 1000000.0; float frame_slice=1.0/OS::get_singleton()->get_iterations_per_second(); - //if (time_accum+step < frame_slice) - // return false; +// if (time_accum+step < frame_slice) +// return false; frame+=ticks_elapsed; diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 4949b33c4..c33265ea8 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -223,7 +223,7 @@ void AnimationPlayer::_notification(int p_what) { } break; case NOTIFICATION_EXIT_TREE: { - stop_all(); + //stop_all(); clear_caches(); } break; } |