asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #27686 from ForLoveOfCats/master

Browse source 
Mono: Make GD.Convert take Variant.Type instead of int
This commit is contained in:
Ignacio Roldán Etcheverry 2019-04-04 22:17:25 +02:00 committed by GitHub
commit 21da74b514
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/mono/glue/Managed/Files/GD.cs
View file

@ -18,7 +18,7 @@ namespace Godot
return godot_icall_GD_bytes2var(bytes, allow_objects); 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); 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); internal extern static object godot_icall_GD_bytes2var(byte[] bytes, bool allow_objects);
[MethodImpl(MethodImplOptions.InternalCall)] [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)] [MethodImpl(MethodImplOptions.InternalCall)]
internal extern static int godot_icall_GD_hash(object var); internal extern static int godot_icall_GD_hash(object var);