mirror of
https://github.com/godotengine/godot
synced 2024-09-05 20:09:26 +00:00
Don't allow creating invalid RESET keys
This commit is contained in:
parent
e96ad5af98
commit
461bb8ee02
|
@ -2931,7 +2931,7 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
|
|||
}
|
||||
if (selected || editor->is_selection_active()) {
|
||||
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);
|
||||
}
|
||||
|
||||
|
@ -4526,6 +4526,16 @@ bool AnimationTrackEditor::is_snap_enabled() const {
|
|||
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() {
|
||||
int selected = _get_track_selected();
|
||||
|
||||
|
@ -6611,6 +6621,11 @@ void AnimationTrackEditor::_edit_menu_pressed(int p_option) {
|
|||
for (const KeyValue<SelectedKey, KeyInfo> &E : selection) {
|
||||
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.
|
||||
if (tracks_added.has(sk.track)) {
|
||||
continue;
|
||||
|
|
|
@ -724,6 +724,7 @@ public:
|
|||
bool is_key_clipboard_active() const;
|
||||
bool is_moving_selection() const;
|
||||
bool is_snap_enabled() const;
|
||||
bool can_add_reset_key() const;
|
||||
float get_moving_selection_offset() const;
|
||||
float snap_time(float p_value, bool p_relative = false);
|
||||
bool is_grouping_tracks();
|
||||
|
|
Loading…
Reference in a new issue