diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-02-11 00:00:11 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-02-11 00:01:35 -0300 |
| commit | db43e941752590f32e949638e35f5891bc8979c3 (patch) | |
| tree | d66e8a430d7eec6cee38d5e5142fbbccc7b9ad25 /scene | |
| parent | 4321b543b5b971e6fc980f51f24c6877fd6ae07e (diff) | |
-Made some icon data types smaller so they take up less space
-Fixed sample import plugin, makes samples sound strange in smp when limited hz
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/animation/animation_player.cpp | 1 | ||||
| -rw-r--r-- | scene/audio/stream_player.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 344fc5ecde..0bc54b3d43 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -211,6 +211,7 @@ void AnimationPlayer::_notification(int p_what) { if (!get_tree()->is_editor_hint() && animation_set.has(autoplay)) { play(autoplay); + set_autoplay(""); //this line is the fix for autoplay issues with animatio } } break; case NOTIFICATION_PROCESS: { diff --git a/scene/audio/stream_player.cpp b/scene/audio/stream_player.cpp index fd18803394..c1799ec12c 100644 --- a/scene/audio/stream_player.cpp +++ b/scene/audio/stream_player.cpp @@ -106,8 +106,10 @@ void StreamPlayer::_notification(int p_what) { resume_pos=-1; } else if (autoplay) { play(); + autoplay = false; //this line fix autoplay issues } } + } break; case NOTIFICATION_EXIT_TREE: { |