diff options
| author | Rémi Verschelde | 2018-01-18 11:23:50 +0100 |
|---|---|---|
| committer | GitHub | 2018-01-18 11:23:50 +0100 |
| commit | 9d45b719d4ed1f50c93f3234b31233ae5039987c (patch) | |
| tree | fe5608de5b549ac21e04668e9f7a6778f82ed2ca /modules/mono/csharp_script.cpp | |
| parent | 945248052cd35df2dcc2408fdd48f3ea511a0562 (diff) | |
| parent | 2dc6725cc467a1aa17980a2aedcd84f6f0a477e2 (diff) | |
| download | godot-9d45b719d4ed1f50c93f3234b31233ae5039987c.tar.gz godot-9d45b719d4ed1f50c93f3234b31233ae5039987c.tar.zst godot-9d45b719d4ed1f50c93f3234b31233ae5039987c.zip | |
Diffstat (limited to 'modules/mono/csharp_script.cpp')
| -rw-r--r-- | modules/mono/csharp_script.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 7df2043a6..aee248136 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -1044,7 +1044,7 @@ bool CSharpInstance::get(const StringName &p_name, Variant &r_ret) const { if (field) { 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; } @@ -1057,7 +1057,7 @@ bool CSharpInstance::get(const StringName &p_name, Variant &r_ret) const { r_ret = Variant(); GDMonoUtils::print_unhandled_exception(exc); } else { - r_ret = GDMonoMarshal::mono_object_to_variant(value, property->get_type()); + r_ret = GDMonoMarshal::mono_object_to_variant(value); } 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); if (return_value) { - return GDMonoMarshal::mono_object_to_variant(return_value, method->get_return_type()); + return GDMonoMarshal::mono_object_to_variant(return_value); } else { 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); if (result) { - return GDMonoMarshal::mono_object_to_variant(result, method->get_return_type()); + return GDMonoMarshal::mono_object_to_variant(result); } else { return Variant(); } |
