Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
a77f6331
Commit
a77f6331
authored
May 30, 2020
by
NutmegStudio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes building mono release templates
parent
0f1da724
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
csharp_script.cpp
modules/mono/csharp_script.cpp
+2
-0
gd_mono.cpp
modules/mono/mono_gd/gd_mono.cpp
+1
-1
No files found.
modules/mono/csharp_script.cpp
View file @
a77f6331
...
...
@@ -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
;
...
...
modules/mono/mono_gd/gd_mono.cpp
View file @
a77f6331
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment