Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 12:12:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #92870 from KoBeWi/maybe_RESET_a_bit_less

Browse Source 
Don't allow creating invalid RESET keys
This commit is contained in:
Rémi Verschelde 2024-06-13 17:19:23 +02:00
commit e988c1a682
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
editor/animation_track_editor.cpp
View File

@ -2934,7 +2934,7 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
} }
if (selected || editor->is_selection_active()) { if (selected || editor->is_selection_active()) {
AnimationPlayer *player = AnimationPlayerEditor::get_singleton()->get_player(); AnimationPlayer *player = AnimationPlayerEditor::get_singleton()->get_player();
if (!player->has_animation(SceneStringName(RESET)) || animation != player->get_animation(SceneStringName(RESET))) { if ((!player->has_animation(SceneStringName(RESET)) || animation != player->get_animation(SceneStringName(RESET))) && editor->can_add_reset_key()) {
menu->add_icon_item(get_editor_theme_icon(SNAME("Reload")), TTR("Add RESET Value(s)"), MENU_KEY_ADD_RESET); menu->add_icon_item(get_editor_theme_icon(SNAME("Reload")), TTR("Add RESET Value(s)"), MENU_KEY_ADD_RESET);
} }
@ -4529,6 +4529,16 @@ bool AnimationTrackEditor::is_snap_enabled() const {
return snap->is_pressed() ^ Input::get_singleton()->is_key_pressed(Key::CMD_OR_CTRL); return snap->is_pressed() ^ Input::get_singleton()->is_key_pressed(Key::CMD_OR_CTRL);
} }
bool AnimationTrackEditor::can_add_reset_key() const {
for (const KeyValue<SelectedKey, KeyInfo> &E : selection) {
const Animation::TrackType track_type = animation->track_get_type(E.key.track);
if (track_type != Animation::TYPE_ANIMATION && track_type != Animation::TYPE_AUDIO && track_type != Animation::TYPE_METHOD) {
return true;
}
}
return false;
}
void AnimationTrackEditor::_update_tracks() { void AnimationTrackEditor::_update_tracks() {
int selected = _get_track_selected(); int selected = _get_track_selected();
@ -6621,6 +6631,11 @@ void AnimationTrackEditor::_edit_menu_pressed(int p_option) {
for (const KeyValue<SelectedKey, KeyInfo> &E : selection) { for (const KeyValue<SelectedKey, KeyInfo> &E : selection) {
const SelectedKey &sk = E.key; const SelectedKey &sk = E.key;
const Animation::TrackType track_type = animation->track_get_type(E.key.track);
if (track_type == Animation::TYPE_ANIMATION || track_type == Animation::TYPE_AUDIO || track_type == Animation::TYPE_METHOD) {
continue;
}
// Only add one key per track. // Only add one key per track.
if (tracks_added.has(sk.track)) { if (tracks_added.has(sk.track)) {
continue; continue;

1
editor/animation_track_editor.h
View File

@ -727,6 +727,7 @@ public:
bool is_key_clipboard_active() const; bool is_key_clipboard_active() const;
bool is_moving_selection() const; bool is_moving_selection() const;
bool is_snap_enabled() const; bool is_snap_enabled() const;
bool can_add_reset_key() const;
float get_moving_selection_offset() const; float get_moving_selection_offset() const;
float snap_time(float p_value, bool p_relative = false); float snap_time(float p_value, bool p_relative = false);
bool is_grouping_tracks(); bool is_grouping_tracks();