diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-06-19 12:53:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-19 12:53:33 +0200 |
| commit | 3eab3c10b554013d4e37d1e9739bfff4e278acd0 (patch) | |
| tree | 216b6a18d4fb204662841b31b6c154320f27fb87 | |
| parent | a8132b2fab599254d8afb68568141c7615f9afb2 (diff) | |
| parent | 2b6bbf8dceb7e31039d23aab05cde447225e1f7c (diff) | |
Merge pull request #39641 from akien-mga/mono-always-define-options
Mono: Always define options in main.cpp to keep them in docs
| -rw-r--r-- | doc/classes/ProjectSettings.xml | 2 | ||||
| -rw-r--r-- | main/main.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml index 92e5b4a84f..7191492098 100644 --- a/doc/classes/ProjectSettings.xml +++ b/doc/classes/ProjectSettings.xml @@ -821,6 +821,8 @@ </member> <member name="mono/profiler/enabled" type="bool" setter="" getter="" default="false"> </member> + <member name="mono/project/auto_update_project" type="bool" setter="" getter="" default="true"> + </member> <member name="mono/unhandled_exception_policy" type="int" setter="" getter="" default="0"> </member> <member name="network/limits/debugger/max_chars_per_second" type="int" setter="" getter="" default="32768"> diff --git a/main/main.cpp b/main/main.cpp index 92b07dc83b..747b12677d 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1633,6 +1633,8 @@ bool Main::start() { GLOBAL_DEF("mono/profiler/args", "log:calls,alloc,sample,output=output.mlpd"); GLOBAL_DEF("mono/profiler/enabled", false); GLOBAL_DEF("mono/unhandled_exception_policy", 0); + // From editor/csharp_project.cpp. + GLOBAL_DEF("mono/project/auto_update_project", true); #endif DocData doc; |