summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-11-04 15:21:06 +0100
committerGitHub <noreply@github.com>2019-11-04 15:21:06 +0100
commit410373dce7dfd50bcce1a63d07af6cc924acc5ae (patch)
tree3132cd97a4c5a24f61cf083a2445eece1c5efe6e
parent86da206b84e107585deddfebc2c311c9dcc10795 (diff)
parent8ca0f1a71c427e9ece931672289d88ad0cbe5a9b (diff)
Merge pull request #33333 from Calinou/remove-unused-project-setting
Remove unused `editor/active` project setting
-rw-r--r--doc/classes/ProjectSettings.xml3
-rw-r--r--main/main.cpp2
2 files changed, 0 insertions, 5 deletions
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index eb937df286..ec7cf14571 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -428,9 +428,6 @@
<member name="display/window/vsync/use_vsync" type="bool" setter="" getter="" default="true">
If [code]true[/code], enables vertical synchronization. This eliminates tearing that may appear in moving scenes, at the cost of higher input latency and stuttering at lower framerates. If [code]false[/code], vertical synchronization will be disabled, however, many platforms will enforce it regardless (such as mobile platforms and HTML5).
</member>
- <member name="editor/active" type="bool" setter="" getter="" default="false">
- Internal editor setting, don't touch.
- </member>
<member name="editor/script_templates_search_path" type="String" setter="" getter="" default="&quot;res://script_templates&quot;">
</member>
<member name="editor/search_in_file_extensions" type="PoolStringArray" setter="" getter="" default="PoolStringArray( &quot;gd&quot;, &quot;shader&quot; )">
diff --git a/main/main.cpp b/main/main.cpp
index 28c4ef7fbb..28ab80bec2 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1423,8 +1423,6 @@ bool Main::start() {
}
}
- GLOBAL_DEF("editor/active", editor);
-
String main_loop_type;
#ifdef TOOLS_ENABLED
if (doc_tool != "") {