diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2018-08-14 18:12:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-14 18:12:18 +0200 |
| commit | d7b9fcd33689673c6237d91afdb4a8dfe548784a (patch) | |
| tree | 3cf914ac9c765d439d49b07bb6b5bbe99332bcf5 /modules/mono | |
| parent | bbdb6cf16ead5138bb18cbf435cdecd63bc7d4ab (diff) | |
| parent | 9341129d149dfafa6b652d9a4a0ca32ccf3cef5f (diff) | |
Merge pull request #20890 from KellyThomas/mono-is-instance-valid
mono: add IsInstanceValid(), move WeakRef()
Diffstat (limited to 'modules/mono')
| -rw-r--r-- | modules/mono/glue/cs_files/GD.cs | 5 | ||||
| -rw-r--r-- | modules/mono/glue/cs_files/ObjectExtensions.cs | 17 | ||||
| -rwxr-xr-x | modules/mono/glue/cs_files/VERSION.txt | 2 |
3 files changed, 18 insertions, 6 deletions
diff --git a/modules/mono/glue/cs_files/GD.cs b/modules/mono/glue/cs_files/GD.cs index 43de9156f2..0a5d703f27 100644 --- a/modules/mono/glue/cs_files/GD.cs +++ b/modules/mono/glue/cs_files/GD.cs @@ -192,10 +192,5 @@ namespace Godot { return NativeCalls.godot_icall_Godot_var2str(var); } - - public static WeakRef WeakRef(Object obj) - { - return NativeCalls.godot_icall_Godot_weakref(Object.GetPtr(obj)); - } } } diff --git a/modules/mono/glue/cs_files/ObjectExtensions.cs b/modules/mono/glue/cs_files/ObjectExtensions.cs new file mode 100644 index 0000000000..5c9e6609f4 --- /dev/null +++ b/modules/mono/glue/cs_files/ObjectExtensions.cs @@ -0,0 +1,17 @@ +using System; + +namespace Godot +{ + public partial class Object + { + public static bool IsInstanceValid(Object instance) + { + return instance != null && instance.NativeInstance != IntPtr.Zero; + } + + public static WeakRef WeakRef(Object obj) + { + return NativeCalls.godot_icall_Godot_weakref(Object.GetPtr(obj)); + } + } +} diff --git a/modules/mono/glue/cs_files/VERSION.txt b/modules/mono/glue/cs_files/VERSION.txt index 7f8f011eb7..45a4fb75db 100755 --- a/modules/mono/glue/cs_files/VERSION.txt +++ b/modules/mono/glue/cs_files/VERSION.txt @@ -1 +1 @@ -7 +8 |