From b84992e37454594a01fd2deec807edcb40d70679 Mon Sep 17 00:00:00 2001 From: zochris <20927697+zochris@users.noreply.github.com> Date: Fri, 5 Oct 2018 15:06:05 +0200 Subject: [PATCH 1/2] loosen generic guard on Node extension methods For more details see #22658 --- .../Managed/Files/Extensions/NodeExtensions.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/mono/glue/Managed/Files/Extensions/NodeExtensions.cs b/modules/mono/glue/Managed/Files/Extensions/NodeExtensions.cs index 71534d77827..c978318cac9 100644 --- a/modules/mono/glue/Managed/Files/Extensions/NodeExtensions.cs +++ b/modules/mono/glue/Managed/Files/Extensions/NodeExtensions.cs @@ -2,42 +2,42 @@ namespace Godot { public partial class Node { - public T GetNode(NodePath path) where T : Godot.Node + public T GetNode(NodePath path) where T : class { return (T)GetNode(path); } - public T GetNodeOrNull(NodePath path) where T : Godot.Node + public T GetNodeOrNull(NodePath path) where T : class { return GetNode(path) as T; } - public T GetChild(int idx) where T : Godot.Node + public T GetChild(int idx) where T : class { return (T)GetChild(idx); } - public T GetChildOrNull(int idx) where T : Godot.Node + public T GetChildOrNull(int idx) where T : class { return GetChild(idx) as T; } - public T GetOwner() where T : Godot.Node + public T GetOwner() where T : class { return (T)GetOwner(); } - public T GetOwnerOrNull() where T : Godot.Node + public T GetOwnerOrNull() where T : class { return GetOwner() as T; } - public T GetParent() where T : Godot.Node + public T GetParent() where T : class { return (T)GetParent(); } - public T GetParentOrNull() where T : Godot.Node + public T GetParentOrNull() where T : class { return GetParent() as T; } From 4a1186496896f71b48a791cc11a9e8c6db5cb416 Mon Sep 17 00:00:00 2001 From: zochris <20927697+zochris@users.noreply.github.com> Date: Fri, 5 Oct 2018 15:32:33 +0200 Subject: [PATCH 2/2] loosen generic guard on method for ResourceLoader For more details see #22658 --- modules/mono/glue/Managed/Files/GD.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mono/glue/Managed/Files/GD.cs b/modules/mono/glue/Managed/Files/GD.cs index 264be235883..3a2a5277045 100644 --- a/modules/mono/glue/Managed/Files/GD.cs +++ b/modules/mono/glue/Managed/Files/GD.cs @@ -65,7 +65,7 @@ namespace Godot return ResourceLoader.Load(path); } - public static T Load(string path) where T : Godot.Resource + public static T Load(string path) where T : class { return (T) ResourceLoader.Load(path); }