Browse Source

Merge pull request #103838 from ebeem/master

Core: Fix translation remaps incorrectly falling back
Thaddeus Crews 3 weeks ago
parent
commit
c2202d36c1
1 changed files with 3 additions and 1 deletions
  1. 3 1
      core/io/resource_loader.cpp

+ 3 - 1
core/io/resource_loader.cpp

@@ -1269,7 +1269,9 @@ String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_rem
 		}
 		}
 
 
 		// Fallback to p_path if new_path does not exist.
 		// Fallback to p_path if new_path does not exist.
-		if (!FileAccess::exists(new_path + ".import") && !FileAccess::exists(new_path)) {
+		if (!FileAccess::exists(new_path + ".import") &&
+				!FileAccess::exists(new_path + ".remap") &&
+				!FileAccess::exists(new_path)) {
 			WARN_PRINT(vformat("Translation remap '%s' does not exist. Falling back to '%s'.", new_path, p_path));
 			WARN_PRINT(vformat("Translation remap '%s' does not exist. Falling back to '%s'.", new_path, p_path));
 			new_path = p_path;
 			new_path = p_path;
 		}
 		}