diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-30 17:10:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-30 17:10:35 +0200 |
| commit | a8787d1ae56006c00b4eecc3506dbc5ec763a8a5 (patch) | |
| tree | 3dab192ba155ad6c0f55b5fc9ff595c7a75a800a /modules | |
| parent | 20a6fcd3ea72b3c26eeb3479709e5b2d2701fbd3 (diff) | |
| parent | a77f633161e5f105a89afbba81056b87319c1aad (diff) | |
Merge pull request #39159 from NutmegStudio/fix-mono-templates
Fix building mono release templates
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mono/csharp_script.cpp | 2 | ||||
| -rw-r--r-- | modules/mono/mono_gd/gd_mono.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 958d72adb1..ae25bd3544 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -2688,7 +2688,9 @@ bool CSharpScript::_get_member_export(IMonoClassMember *p_member, bool p_inspect return true; } +#ifdef TOOLS_ENABLED MonoObject *attr = p_member->get_attribute(CACHED_CLASS(ExportAttribute)); +#endif PropertyHint hint = PROPERTY_HINT_NONE; String hint_string; diff --git a/modules/mono/mono_gd/gd_mono.cpp b/modules/mono/mono_gd/gd_mono.cpp index 5f518d0613..39c3bd8934 100644 --- a/modules/mono/mono_gd/gd_mono.cpp +++ b/modules/mono/mono_gd/gd_mono.cpp @@ -422,10 +422,10 @@ void GDMono::initialize_load_assemblies() { #if defined(TOOLS_ENABLED) bool tool_assemblies_loaded = _load_tools_assemblies(); CRASH_COND_MSG(!tool_assemblies_loaded, "Mono: Failed to load '" TOOLS_ASM_NAME "' assemblies."); -#endif if (Main::is_project_manager()) return; +#endif // Load the project's main assembly. This doesn't necessarily need to succeed. // The game may not be using .NET at all, or if the project does use .NET and |