diff options
author | Haoyu Qiu <timothyqiu32@gmail.com> | 2022-05-05 11:19:54 +0800 |
---|---|---|
committer | Haoyu Qiu <timothyqiu32@gmail.com> | 2022-05-05 11:19:54 +0800 |
commit | b3162e270e7b3e885330a61570f148b76f25950f (patch) | |
tree | 31c2a280cc82eecd60249bb0d1edd6a906647d03 /editor | |
parent | 0f8ee1d256c2bc7dc7bafc32e8137644bcc4a8ae (diff) |
Fix global AnimationLibrary name validation
Diffstat (limited to 'editor')
-rw-r--r-- | editor/plugins/animation_library_editor.cpp | 6 | ||||
-rw-r--r-- | editor/plugins/animation_player_editor_plugin.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/editor/plugins/animation_library_editor.cpp b/editor/plugins/animation_library_editor.cpp index 581c3c05a5..b43a4215b1 100644 --- a/editor/plugins/animation_library_editor.cpp +++ b/editor/plugins/animation_library_editor.cpp @@ -55,7 +55,7 @@ void AnimationLibraryEditor::_add_library_validate(const String &p_name) { ERR_FAIL_COND(al.is_null()); if (p_name == "") { error = TTR("Animation name can't be empty."); - } else if (!AnimationLibrary::is_valid_name(p_name)) { + } else if (!AnimationLibrary::is_valid_animation_name(p_name)) { error = TTR("Animation name contains invalid characters: '/', ':', ',' or '['."); } else if (al->has_animation(p_name)) { error = TTR("Animation with the same name already exists."); @@ -63,7 +63,7 @@ void AnimationLibraryEditor::_add_library_validate(const String &p_name) { } else { if (p_name == "" && bool(player->call("has_animation_library", ""))) { error = TTR("Enter a library name."); - } else if (!AnimationLibrary::is_valid_name(p_name)) { + } else if (!AnimationLibrary::is_valid_library_name(p_name)) { error = TTR("Library name contains invalid characters: '/', ':', ',' or '['."); } else if (bool(player->call("has_animation_library", p_name))) { error = TTR("Library with the same name already exists."); @@ -256,7 +256,7 @@ void AnimationLibraryEditor::_load_file(String p_path) { } } - String name = AnimationLibrary::validate_name(p_path.get_file().get_basename()); + String name = AnimationLibrary::validate_library_name(p_path.get_file().get_basename()); int attempt = 1; diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 67d6c66c89..581dab84b4 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -427,7 +427,7 @@ void AnimationPlayerEditor::_animation_name_edited() { player->stop(); String new_name = name->get_text(); - if (!AnimationLibrary::is_valid_name(new_name)) { + if (!AnimationLibrary::is_valid_animation_name(new_name)) { error_dialog->set_text(TTR("Invalid animation name!")); error_dialog->popup_centered(); return; |