Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix global AnimationLibrary name validation

Browse source
This commit is contained in:
Haoyu Qiu 2022-05-05 11:19:54 +08:00
parent 0f8ee1d256
commit b3162e270e
4 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
editor/plugins/animation_library_editor.cpp
View file

@ -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;