diff options
author | Ignacio Roldán Etcheverry <neikeq@users.noreply.github.com> | 2019-04-04 22:17:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-04 22:17:25 +0200 |
commit | 21da74b5146fb6c853274ae9bd2a5f51874edafc (patch) | |
tree | 763769f9caeb9b12776241576e04f8ff41a8def8 | |
parent | 6d2722613476f36c584b69b5b4e9dd88e4be1cec (diff) | |
parent | 46e79e6fadeef1795014b45d8f0f485e5025c51c (diff) |
Merge pull request #27686 from ForLoveOfCats/master
Mono: Make GD.Convert take Variant.Type instead of int
-rw-r--r-- | modules/mono/glue/Managed/Files/GD.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/glue/Managed/Files/GD.cs b/modules/mono/glue/Managed/Files/GD.cs index aaae72fbe3..d968f8a78f 100644 --- a/modules/mono/glue/Managed/Files/GD.cs +++ b/modules/mono/glue/Managed/Files/GD.cs @@ -18,7 +18,7 @@ namespace Godot return godot_icall_GD_bytes2var(bytes, allow_objects); } - public static object Convert(object what, int type) + public static object Convert(object what, Variant.Type type) { return godot_icall_GD_convert(what, type); } @@ -200,7 +200,7 @@ namespace Godot internal extern static object godot_icall_GD_bytes2var(byte[] bytes, bool allow_objects); [MethodImpl(MethodImplOptions.InternalCall)] - internal extern static object godot_icall_GD_convert(object what, int type); + internal extern static object godot_icall_GD_convert(object what, Variant.Type type); [MethodImpl(MethodImplOptions.InternalCall)] internal extern static int godot_icall_GD_hash(object var); |