From 0f3fc930703918ba83b7b83f3ff3849015219a0a Mon Sep 17 00:00:00 2001 From: Ignacio Etcheverry Date: Thu, 8 Nov 2018 16:47:15 +0100 Subject: [PATCH] Fix assertion fail when loading assembly on project export --- modules/mono/config.py | 6 +----- modules/mono/editor/godotsharp_export.cpp | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/mono/config.py b/modules/mono/config.py index 8427103ee7b..189699cca8a 100644 --- a/modules/mono/config.py +++ b/modules/mono/config.py @@ -265,11 +265,7 @@ def make_template_dir(env, mono_root): template_dir_name = '' - if platform == 'windows': - template_dir_name = 'data.mono.%s.%s.%s' % (platform, env['bits'], target) - elif platform == 'osx': - template_dir_name = 'data.mono.%s.%s' % (platform, target) - elif platform == 'x11': + if platform in ['windows', 'osx', 'x11']: template_dir_name = 'data.mono.%s.%s.%s' % (platform, env['bits'], target) else: assert False diff --git a/modules/mono/editor/godotsharp_export.cpp b/modules/mono/editor/godotsharp_export.cpp index 509ec961fbf..34c710320ac 100644 --- a/modules/mono/editor/godotsharp_export.cpp +++ b/modules/mono/editor/godotsharp_export.cpp @@ -117,7 +117,7 @@ void GodotSharpExport::_export_begin(const Set &p_features, bool p_debug GDMonoAssembly *scripts_assembly = NULL; bool load_success = GDMono::get_singleton()->load_assembly_from(project_dll_name, - project_dll_src_dir, &scripts_assembly, /* refonly: */ true); + project_dll_src_path, &scripts_assembly, /* refonly: */ true); ERR_EXPLAIN("Cannot load refonly assembly: " + project_dll_name); ERR_FAIL_COND(!load_success);