Merge pull request #56630 from Pineapple/replace-find-last

This commit is contained in:
Rémi Verschelde 2022-01-18 16:36:52 +01:00 committed by GitHub
commit c938104a88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 35 additions and 43 deletions

View file

@ -722,11 +722,11 @@ void AnimationPlayerEditor::_dialog_action(String p_file) {
Ref<Resource> res = ResourceLoader::load(p_file, "Animation");
ERR_FAIL_COND_MSG(res.is_null(), "Cannot load Animation from file '" + p_file + "'.");
ERR_FAIL_COND_MSG(!res->is_class("Animation"), "Loaded resource from file '" + p_file + "' is not Animation.");
if (p_file.find_last("/") != -1) {
p_file = p_file.substr(p_file.find_last("/") + 1, p_file.length());
if (p_file.rfind("/") != -1) {
p_file = p_file.substr(p_file.rfind("/") + 1, p_file.length());
}
if (p_file.find_last("\\") != -1) {
p_file = p_file.substr(p_file.find_last("\\") + 1, p_file.length());
if (p_file.rfind("\\") != -1) {
p_file = p_file.substr(p_file.rfind("\\") + 1, p_file.length());
}
if (p_file.find(".") != -1) {