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

Fix a merge error

This commit is contained in:
Hein-Pieter van Braam 2018-04-15 00:43:26 +02:00
parent 548ec63f76
commit e4fadebc3b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mono/mono_gd/gd_mono.cpp
View File

@ -412,7 +412,7 @@ bool GDMono::_load_core_api_assembly() {
return false; return false;
#endif #endif
bool success = load_assembly(API_ASSEMBLY_NAME, &api_assembly); bool success = load_assembly(API_ASSEMBLY_NAME, &core_api_assembly);
if (success) { if (success) {
#ifndef MONO_GLUE_DISABLED #ifndef MONO_GLUE_DISABLED