summaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2016-07-14 19:29:52 +0200
committerGitHub <noreply@github.com>2016-07-14 19:29:52 +0200
commit3e2c7bf797bd073727e5d0272ce47aa77895935b (patch)
treef3e627f48e40eeb4f015f8a945099227ad2d1c75 /tools/editor
parent9a931e333c5e3fe9e455500319d861e1bd1386cd (diff)
parent8772b8ea85278f67832a34e51724720c46916f27 (diff)
Merge pull request #5697 from TheHX/issue-5664
Fix Orphan StringName on EditorAutoloadSettings class
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/editor_autoload_settings.cpp2
-rw-r--r--tools/editor/editor_autoload_settings.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/tools/editor/editor_autoload_settings.cpp b/tools/editor/editor_autoload_settings.cpp
index 1cf0090e7e..97062b1480 100644
--- a/tools/editor/editor_autoload_settings.cpp
+++ b/tools/editor/editor_autoload_settings.cpp
@@ -36,8 +36,6 @@
#define PREVIEW_LIST_MAX_SIZE 10
-StringName EditorAutoloadSettings::autoload_changed = StringName();
-
void EditorAutoloadSettings::_notification(int p_what) {
if (p_what == NOTIFICATION_ENTER_TREE) {
diff --git a/tools/editor/editor_autoload_settings.h b/tools/editor/editor_autoload_settings.h
index b8825f807c..b61c44b9c2 100644
--- a/tools/editor/editor_autoload_settings.h
+++ b/tools/editor/editor_autoload_settings.h
@@ -44,7 +44,7 @@ class EditorAutoloadSettings : public VBoxContainer {
BUTTON_DELETE
};
- static StringName autoload_changed;
+ String autoload_changed;
struct AutoLoadInfo {
String name;