From d63bf6dea5b94d7f74b8ea22c4a182d205b1d93f Mon Sep 17 00:00:00 2001
From: lupoDharkael <izhe@hotmail.es>
Date: Sun, 8 Mar 2020 17:33:34 +0100
Subject: [PATCH] Complete NavigationMeshInstance rename

---
 .../gdnavigation/navigation_mesh_editor_plugin.cpp |  6 +++---
 .../gdnavigation/navigation_mesh_editor_plugin.h   |  2 +-
 scene/3d/navigation_region.cpp                     | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/gdnavigation/navigation_mesh_editor_plugin.cpp b/modules/gdnavigation/navigation_mesh_editor_plugin.cpp
index 5c298ae9e4..e6ff7a7afa 100644
--- a/modules/gdnavigation/navigation_mesh_editor_plugin.cpp
+++ b/modules/gdnavigation/navigation_mesh_editor_plugin.cpp
@@ -84,13 +84,13 @@ void NavigationMeshEditor::_clear_pressed() {
 	}
 }
 
-void NavigationMeshEditor::edit(NavigationRegion *p_nav_mesh_instance) {
+void NavigationMeshEditor::edit(NavigationRegion *p_nav_region) {
 
-	if (p_nav_mesh_instance == NULL || node == p_nav_mesh_instance) {
+	if (p_nav_region == NULL || node == p_nav_region) {
 		return;
 	}
 
-	node = p_nav_mesh_instance;
+	node = p_nav_region;
 }
 
 void NavigationMeshEditor::_bind_methods() {
diff --git a/modules/gdnavigation/navigation_mesh_editor_plugin.h b/modules/gdnavigation/navigation_mesh_editor_plugin.h
index 7c3faebf57..847ad4f63d 100644
--- a/modules/gdnavigation/navigation_mesh_editor_plugin.h
+++ b/modules/gdnavigation/navigation_mesh_editor_plugin.h
@@ -61,7 +61,7 @@ protected:
 	void _notification(int p_option);
 
 public:
-	void edit(NavigationRegion *p_nav_mesh_instance);
+	void edit(NavigationRegion *p_nav_region);
 	NavigationMeshEditor();
 	~NavigationMeshEditor();
 };
diff --git a/scene/3d/navigation_region.cpp b/scene/3d/navigation_region.cpp
index d96d095797..53b707a29a 100644
--- a/scene/3d/navigation_region.cpp
+++ b/scene/3d/navigation_region.cpp
@@ -162,22 +162,22 @@ Ref<NavigationMesh> NavigationRegion::get_navigation_mesh() const {
 }
 
 struct BakeThreadsArgs {
-	NavigationRegion *nav_mesh_instance;
+	NavigationRegion *nav_region;
 };
 
 void _bake_navigation_mesh(void *p_user_data) {
 	BakeThreadsArgs *args = static_cast<BakeThreadsArgs *>(p_user_data);
 
-	if (args->nav_mesh_instance->get_navigation_mesh().is_valid()) {
-		Ref<NavigationMesh> nav_mesh = args->nav_mesh_instance->get_navigation_mesh()->duplicate();
+	if (args->nav_region->get_navigation_mesh().is_valid()) {
+		Ref<NavigationMesh> nav_mesh = args->nav_region->get_navigation_mesh()->duplicate();
 
-		NavigationServer::get_singleton()->region_bake_navmesh(nav_mesh, args->nav_mesh_instance);
-		args->nav_mesh_instance->call_deferred("_bake_finished", nav_mesh);
+		NavigationServer::get_singleton()->region_bake_navmesh(nav_mesh, args->nav_region);
+		args->nav_region->call_deferred("_bake_finished", nav_mesh);
 		memdelete(args);
 	} else {
 
 		ERR_PRINT("Can't bake the navigation mesh if the `NavigationMesh` resource doesn't exist");
-		args->nav_mesh_instance->call_deferred("_bake_finished", Ref<NavigationMesh>());
+		args->nav_region->call_deferred("_bake_finished", Ref<NavigationMesh>());
 		memdelete(args);
 	}
 }
@@ -186,7 +186,7 @@ void NavigationRegion::bake_navigation_mesh() {
 	ERR_FAIL_COND(bake_thread != NULL);
 
 	BakeThreadsArgs *args = memnew(BakeThreadsArgs);
-	args->nav_mesh_instance = this;
+	args->nav_region = this;
 
 	bake_thread = Thread::create(_bake_navigation_mesh, args);
 	ERR_FAIL_COND(bake_thread == NULL);