diff options
| author | Ignacio Roldán Etcheverry <neikeq@users.noreply.github.com> | 2019-04-06 17:16:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-06 17:16:20 +0200 |
| commit | 278aeb114269d3e374960ec93d435c8a2524c75b (patch) | |
| tree | bb37b12db291604df52c68a0a127ab92b2b7edbf /modules | |
| parent | 74719b8748d338c143a62b3659693af0d82b784c (diff) | |
| parent | 2f3328a039ac31368dfc9d93ae95702c0d9db827 (diff) | |
Merge pull request #27729 from neikeq/fix-wrong-classdb-binds
Fix wrong method binds and registered class
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/assimp/register_types.cpp | 6 | ||||
| -rw-r--r-- | modules/mono/glue/base_object_glue.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/modules/assimp/register_types.cpp b/modules/assimp/register_types.cpp index 0afb1e72bf..2e8181372e 100644 --- a/modules/assimp/register_types.cpp +++ b/modules/assimp/register_types.cpp @@ -44,7 +44,13 @@ static void _editor_init() { void register_assimp_types() { #ifdef TOOLS_ENABLED + ClassDB::APIType prev_api = ClassDB::get_current_api(); + ClassDB::set_current_api(ClassDB::API_EDITOR); + ClassDB::register_class<EditorSceneImporterAssimp>(); + + ClassDB::set_current_api(prev_api); + EditorNode::add_init_callback(_editor_init); #endif } diff --git a/modules/mono/glue/base_object_glue.cpp b/modules/mono/glue/base_object_glue.cpp index b690de0d20..7f367fa095 100644 --- a/modules/mono/glue/base_object_glue.cpp +++ b/modules/mono/glue/base_object_glue.cpp @@ -192,7 +192,7 @@ MonoBoolean godot_icall_DynamicGodotObject_InvokeMember(Object *p_ptr, MonoStrin *r_result = GDMonoMarshal::variant_to_mono_object(result); - return error.error == OK; + return error.error == Variant::CallError::CALL_OK; } MonoBoolean godot_icall_DynamicGodotObject_GetMember(Object *p_ptr, MonoString *p_name, MonoObject **r_result) { |