diff options
| author | Rémi Verschelde | 2018-02-25 21:51:11 +0100 |
|---|---|---|
| committer | GitHub | 2018-02-25 21:51:11 +0100 |
| commit | 7568a455397aeefc1e08600534ec4df279abab70 (patch) | |
| tree | 2ae483b9c89320bacd7e6ad1939448d9741ba0d9 /modules/mono/mono_gd/gd_mono_utils.cpp | |
| parent | 125fc8cc4432d28e63da76c3a2aff655b1a7cc6b (diff) | |
| parent | f37090ccf4f699800a43878273b8b94b5906f4bc (diff) | |
| download | godot-7568a455397aeefc1e08600534ec4df279abab70.tar.gz godot-7568a455397aeefc1e08600534ec4df279abab70.tar.zst godot-7568a455397aeefc1e08600534ec4df279abab70.zip | |
Merge pull request #17020 from neikeq/cs-api-asm-checks
Mono: Better versioning and gracefully unloading of Godot API assemblies
Diffstat (limited to 'modules/mono/mono_gd/gd_mono_utils.cpp')
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_utils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/mono/mono_gd/gd_mono_utils.cpp b/modules/mono/mono_gd/gd_mono_utils.cpp index ca7628d83..297992f62 100644 --- a/modules/mono/mono_gd/gd_mono_utils.cpp +++ b/modules/mono/mono_gd/gd_mono_utils.cpp @@ -143,7 +143,7 @@ void MonoCache::cleanup() { godot_api_cache_updated = false; } -#define GODOT_API_CLASS(m_class) (GDMono::get_singleton()->get_api_assembly()->get_class(BINDINGS_NAMESPACE, #m_class)) +#define GODOT_API_CLASS(m_class) (GDMono::get_singleton()->get_core_api_assembly()->get_class(BINDINGS_NAMESPACE, #m_class)) void update_corlib_cache() { @@ -245,7 +245,7 @@ void update_godot_api_cache() { mono_runtime_object_init(task_scheduler); mono_cache.task_scheduler_handle = MonoGCHandle::create_strong(task_scheduler); - mono_cache.corlib_cache_updated = true; + mono_cache.godot_api_cache_updated = true; } void clear_cache() { @@ -305,7 +305,7 @@ GDMonoClass *type_get_proxy_class(const StringName &p_type) { if (class_name[0] == '_') class_name = class_name.substr(1, class_name.length()); - GDMonoClass *klass = GDMono::get_singleton()->get_api_assembly()->get_class(BINDINGS_NAMESPACE, class_name); + GDMonoClass *klass = GDMono::get_singleton()->get_core_api_assembly()->get_class(BINDINGS_NAMESPACE, class_name); #ifdef TOOLS_ENABLED if (!klass) { @@ -321,7 +321,7 @@ GDMonoClass *get_class_native_base(GDMonoClass *p_class) { do { const GDMonoAssembly *assembly = klass->get_assembly(); - if (assembly == GDMono::get_singleton()->get_api_assembly()) + if (assembly == GDMono::get_singleton()->get_core_api_assembly()) return klass; #ifdef TOOLS_ENABLED if (assembly == GDMono::get_singleton()->get_editor_api_assembly()) |