From da455147d18674d02ba4b88bd575b58de472c617 Mon Sep 17 00:00:00 2001
From: Cory Petkovsek <632766+TokisanGames@users.noreply.github.com>
Date: Sun, 2 Jul 2023 00:26:06 +0700
Subject: [PATCH] =?UTF-8?q?=EF=BB=BFChanges=20for=204.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 godot-cpp                                     | 2 +-
 project/addons/terrain_3d/editor/editor.gd    | 6 ++----
 project/addons/terrain_3d/terrain.gdextension | 1 +
 project/project.godot                         | 2 +-
 src/register_types.cpp                        | 6 ++----
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/godot-cpp b/godot-cpp
index 3a9118cb0..d627942b6 160000
--- a/godot-cpp
+++ b/godot-cpp
@@ -1 +1 @@
-Subproject commit 3a9118cb0dafef74773216c47a030c3a4a490747
+Subproject commit d627942b647105aff600225a59dffa65de206247
diff --git a/project/addons/terrain_3d/editor/editor.gd b/project/addons/terrain_3d/editor/editor.gd
index 28b827a1d..fe9cebf7d 100644
--- a/project/addons/terrain_3d/editor/editor.gd
+++ b/project/addons/terrain_3d/editor/editor.gd
@@ -59,11 +59,9 @@ func _edit(object: Object) -> void:
 	if object is Terrain3D:
 		if object == terrain:
 			return
-			
 		terrain = object
-		# If 'terrain' is passed to editor instead of 'object', Godot crashes.
-		editor.set_terrain(object)
-		region_gizmo.set_node_3d(object)
+		editor.set_terrain(terrain)
+		region_gizmo.set_node_3d(terrain)
 		terrain.add_gizmo(region_gizmo)
 		terrain.set_plugin(self)
 		
diff --git a/project/addons/terrain_3d/terrain.gdextension b/project/addons/terrain_3d/terrain.gdextension
index 26acb5664..e7d2ea4d2 100644
--- a/project/addons/terrain_3d/terrain.gdextension
+++ b/project/addons/terrain_3d/terrain.gdextension
@@ -1,6 +1,7 @@
 [configuration]
 
 entry_symbol = "terrain_library_init"
+compatibility_minimum = 4.1
 
 [libraries]
 
diff --git a/project/project.godot b/project/project.godot
index dbe660390..cffd2fd0e 100644
--- a/project/project.godot
+++ b/project/project.godot
@@ -12,7 +12,7 @@ config_version=5
 
 config/name="Terrain3D"
 run/main_scene="res://demo/Demo.tscn"
-config/features=PackedStringArray("4.0")
+config/features=PackedStringArray("4.1")
 
 [display]
 
diff --git a/src/register_types.cpp b/src/register_types.cpp
index 658f7b6ba..cdd424c1e 100644
--- a/src/register_types.cpp
+++ b/src/register_types.cpp
@@ -28,11 +28,9 @@ void uninitialize_terrain_types(ModuleInitializationLevel p_level) {
 }
 
 extern "C" {
-
 // Initialization.
-
-GDExtensionBool GDE_EXPORT terrain_library_init(const GDExtensionInterface *p_interface, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
-	GDExtensionBinding::InitObject init_obj(p_interface, p_library, r_initialization);
+GDExtensionBool GDE_EXPORT terrain_library_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
+	GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library, r_initialization);
 
 	init_obj.register_initializer(initialize_terrain_types);
 	init_obj.register_terminator(uninitialize_terrain_types);