godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39641 from akien-mga/mono-always-define-options 

Mono: Always define options in main.cpp to keep them in docs
This commit is contained in:
Rémi Verschelde 2020-06-19 12:53:33 +02:00 committed by GitHub
parent a8132b2fab 2b6bbf8dce
commit 3eab3c10b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/ProjectSettings.xml
View File

@ -821,6 +821,8 @@
</member> </member>
<member name="mono/profiler/enabled" type="bool" setter="" getter="" default="false"> <member name="mono/profiler/enabled" type="bool" setter="" getter="" default="false">
</member> </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 name="mono/unhandled_exception_policy" type="int" setter="" getter="" default="0">
</member> </member>
<member name="network/limits/debugger/max_chars_per_second" type="int" setter="" getter="" default="32768"> <member name="network/limits/debugger/max_chars_per_second" type="int" setter="" getter="" default="32768">

2
main/main.cpp
View File

@ -1633,6 +1633,8 @@ bool Main::start() {
GLOBAL_DEF("mono/profiler/args", "log:calls,alloc,sample,output=output.mlpd"); GLOBAL_DEF("mono/profiler/args", "log:calls,alloc,sample,output=output.mlpd");
GLOBAL_DEF("mono/profiler/enabled", false); GLOBAL_DEF("mono/profiler/enabled", false);
GLOBAL_DEF("mono/unhandled_exception_policy", 0); GLOBAL_DEF("mono/unhandled_exception_policy", 0);
// From editor/csharp_project.cpp.
GLOBAL_DEF("mono/project/auto_update_project", true);
#endif #endif
DocData doc; DocData doc;