summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-09-13 21:10:50 +0200
committerGitHub <noreply@github.com>2021-09-13 21:10:50 +0200
commit45d9df2e63bb8ecb65db408e6672533655d4a3d5 (patch)
tree568d171d85d2219ebb52b2f48e44d0013ee74b60 /editor
parentffe8412291958a3e920dda7c5134953f8c721fe1 (diff)
parent2e5fa124f4578bd5d311f994043e7a0136b785e0 (diff)
Merge pull request #52632 from vnen/autoload-global-script-class-conflict
Disallow class names to be the same as global names
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_autoload_settings.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp
index fad76682b5..362c4c3457 100644
--- a/editor/editor_autoload_settings.cpp
+++ b/editor/editor_autoload_settings.cpp
@@ -78,6 +78,14 @@ bool EditorAutoloadSettings::_autoload_name_is_valid(const String &p_name, Strin
return false;
}
+ if (ScriptServer::is_global_class(p_name)) {
+ if (r_error) {
+ *r_error = TTR("Invalid name.") + "\n" + TTR("Must not collide with an existing global script class name.");
+ }
+
+ return false;
+ }
+
for (int i = 0; i < Variant::VARIANT_MAX; i++) {
if (Variant::get_type_name(Variant::Type(i)) == p_name) {
if (r_error) {