diff options
| -rw-r--r-- | demos/2d/motion/engine.cfg | 3 | ||||
| -rw-r--r-- | main/main.cpp | 4 | ||||
| -rw-r--r-- | scene/animation/animation_player.cpp | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/demos/2d/motion/engine.cfg b/demos/2d/motion/engine.cfg index 261111904c..29c4d0da20 100644 --- a/demos/2d/motion/engine.cfg +++ b/demos/2d/motion/engine.cfg @@ -3,9 +3,12 @@ name="Motion Test" main_scene="res://motion.scn" +<<<<<<< HEAD +======= [display] width=800 height=600 stretch_mode="2d" stretch_aspect="keep" +>>>>>>> ab99671bb835a5fe24a092ec34afe1ad862ac254 diff --git a/main/main.cpp b/main/main.cpp index 531d7cfbdc..2d5039b658 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 6676f70981..74ae2c0d55 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; } |