summaryrefslogtreecommitdiff
path: root/editor/plugins
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-01-12 14:30:46 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-01-12 14:30:46 +0100
commita8a9892ad664410502f56a564923fd7cc04474a6 (patch)
treee1e17c43edbc49eb25c9a0cddfaff9088bb3982e /editor/plugins
parent5b627dec72554523aed1476c98f5482e2a499690 (diff)
parentf64dd732b8ac249d052519940e46129960e0d771 (diff)
Merge pull request #71218 from KoBeWi/unlimited_bikeshedding_lets_go
Split pause() from AnimationPlayer's stop()
Diffstat (limited to 'editor/plugins')
-rw-r--r--editor/plugins/animation_player_editor_plugin.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
index ec3eb1a494..10f2ce25d9 100644
--- a/editor/plugins/animation_player_editor_plugin.cpp
+++ b/editor/plugins/animation_player_editor_plugin.cpp
@@ -267,7 +267,7 @@ void AnimationPlayerEditor::_stop_pressed() {
return;
}
- player->stop(false);
+ player->pause();
play->set_pressed(false);
stop->set_pressed(true);
}
@@ -1155,7 +1155,7 @@ void AnimationPlayerEditor::_seek_value_changed(float p_value, bool p_set, bool
player->seek_delta(pos, pos - cpos);
} else {
- player->stop(true);
+ player->stop();
player->seek(pos, true);
}
}