summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-08-25 13:01:55 +0200
committerRémi Verschelde <rverschelde@gmail.com>2020-08-25 13:02:03 +0200
commitf13207254c9a55a0adccf45707c8e4623c2649ac (patch)
treee6cc7192ff7581a79c6540cccaf7300fed1e5cd0
parentdd58f4da66dab7b86d5919b6e1dc951dc0ad04c7 (diff)
Revert "Check if global class file still exists before registering it"
And revert follow-up regression fix "Remap script path when registering class." After the regression fix, the original issue is valid again so it's better to go back to the previous state. This reverts commits e264ae20d2a828201a50868b3af334a3f8c8a37c and fceb64827ea50364f34f4ba9db3910602d1911bf.
-rw-r--r--core/script_language.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/script_language.cpp b/core/script_language.cpp
index 360995ea15..b63aeb952c 100644
--- a/core/script_language.cpp
+++ b/core/script_language.cpp
@@ -33,8 +33,6 @@
#include "core/core_string_names.h"
#include "core/debugger/engine_debugger.h"
#include "core/debugger/script_debugger.h"
-#include "core/io/resource_loader.h"
-#include "core/os/file_access.h"
#include "core/project_settings.h"
#include <stdint.h>
@@ -164,7 +162,7 @@ void ScriptServer::init_languages() {
for (int i = 0; i < script_classes.size(); i++) {
Dictionary c = script_classes[i];
- if (!c.has("class") || !c.has("language") || !c.has("path") || !FileAccess::exists(ResourceLoader::path_remap(c["path"])) || !c.has("base")) {
+ if (!c.has("class") || !c.has("language") || !c.has("path") || !c.has("base")) {
continue;
}
add_global_class(c["class"], c["base"], c["language"], c["path"]);