From fa82727f5bc0f43d4ea8c5bb07076eccd13e6d4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20Pu=C5=82awski?=
<31245410+pulawskig@users.noreply.github.com>
Date: Wed, 23 Jun 2021 16:07:23 +0200
Subject: Fixing mono build after instance() -> instanciate() name change
---
modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs | 4 ++--
.../GodotSharp/Core/Extensions/PackedSceneExtensions.cs | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs
index 21fe2706b2..451ce39f5c 100644
--- a/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs
@@ -114,12 +114,12 @@ namespace GodotTools.Ides
if (Utils.OS.IsMacOS && editorId == ExternalEditorId.VisualStudioForMac)
{
vsForMacInstance = (vsForMacInstance?.IsDisposed ?? true ? null : vsForMacInstance) ??
- new MonoDevelop.Instantiate(solutionPath, MonoDevelop.EditorId.VisualStudioForMac);
+ new MonoDevelop.Instance(solutionPath, MonoDevelop.EditorId.VisualStudioForMac);
return vsForMacInstance;
}
monoDevelInstance = (monoDevelInstance?.IsDisposed ?? true ? null : monoDevelInstance) ??
- new MonoDevelop.Instantiate(solutionPath, MonoDevelop.EditorId.MonoDevelop);
+ new MonoDevelop.Instance(solutionPath, MonoDevelop.EditorId.MonoDevelop);
return monoDevelInstance;
}
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Extensions/PackedSceneExtensions.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Extensions/PackedSceneExtensions.cs
index 763f470504..214bbf5179 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Extensions/PackedSceneExtensions.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Extensions/PackedSceneExtensions.cs
@@ -8,9 +8,9 @@ namespace Godot
/// `Node.NotificationInstanced` notification on the root node.
///
/// The type to cast to. Should be a descendant of Node.
- public T Instance(PackedScene.GenEditState editState = (PackedScene.GenEditState)0) where T : class
+ public T Instantiate(PackedScene.GenEditState editState = (PackedScene.GenEditState)0) where T : class
{
- return (T)(object)Instance(editState);
+ return (T)(object)Instantiate(editState);
}
///
@@ -19,9 +19,9 @@ namespace Godot
/// `Node.NotificationInstanced` notification on the root node.
///
/// The type to cast to. Should be a descendant of Node.
- public T InstanceOrNull(PackedScene.GenEditState editState = (PackedScene.GenEditState)0) where T : class
+ public T InstantiateOrNull(PackedScene.GenEditState editState = (PackedScene.GenEditState)0) where T : class
{
- return Instance(editState) as T;
+ return Instantiate(editState) as T;
}
}
}
--
cgit v1.2.3