godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

fix marshalling when a function is returning an object from c#

Browse Source
This commit is contained in:
Paul Joannon
2018-01-17 20:29:44 +01:00
parent fd3011ca9c
commit 1de5f7e70b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/mono/csharp_script.cpp
View File

@@ -1044,7 +1044,7 @@ bool CSharpInstance::get(const StringName &p_name, Variant &r_ret) const {
if (field) { if (field) {
MonoObject *value = field->get_value(mono_object); MonoObject *value = field->get_value(mono_object);
r_ret = GDMonoMarshal::mono_object_to_variant(value, field->get_type()); r_ret = GDMonoMarshal::mono_object_to_variant(value);
return true; return true;
} }
@@ -1057,7 +1057,7 @@ bool CSharpInstance::get(const StringName &p_name, Variant &r_ret) const {
r_ret = Variant(); r_ret = Variant();
GDMonoUtils::print_unhandled_exception(exc); GDMonoUtils::print_unhandled_exception(exc);
} else { } else {
r_ret = GDMonoMarshal::mono_object_to_variant(value, property->get_type()); r_ret = GDMonoMarshal::mono_object_to_variant(value);
} }
return true; return true;
} }
@@ -1147,7 +1147,7 @@ Variant CSharpInstance::call(const StringName &p_method, const Variant **p_args,
MonoObject *return_value = method->invoke(mono_object, p_args); MonoObject *return_value = method->invoke(mono_object, p_args);
if (return_value) { if (return_value) {
return GDMonoMarshal::mono_object_to_variant(return_value, method->get_return_type()); return GDMonoMarshal::mono_object_to_variant(return_value);
} else { } else {
return Variant(); return Variant();
} }
@@ -1633,7 +1633,7 @@ Variant CSharpScript::call(const StringName &p_method, const Variant **p_args, i
MonoObject *result = method->invoke(NULL, p_args); MonoObject *result = method->invoke(NULL, p_args);
if (result) { if (result) {
return GDMonoMarshal::mono_object_to_variant(result, method->get_return_type()); return GDMonoMarshal::mono_object_to_variant(result);
} else { } else {
return Variant(); return Variant();
} }