From 1b5d2102bc2d041f23fed9b61584e3835bd9ddb3 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Mon, 21 Feb 2022 22:13:52 +0100
Subject: [PATCH] Fix a 2D2D.

---
 material_cache/prop_2d_material_cache.cpp | 4 ++--
 prop_2d_instance.cpp                      | 2 +-
 prop_2d_instance_merger.cpp               | 2 +-
 prop_2d_instance_prop_job.cpp             | 4 ++--
 prop_2d_instance_prop_job.h               | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/material_cache/prop_2d_material_cache.cpp b/material_cache/prop_2d_material_cache.cpp
index ef27215..8512754 100644
--- a/material_cache/prop_2d_material_cache.cpp
+++ b/material_cache/prop_2d_material_cache.cpp
@@ -190,7 +190,7 @@ void Prop2DMaterialCache::prop_add_textures(const Ref<Prop2DData> &prop) {
 
 	for (int i = 0; i < prop->get_prop_count(); ++i) {
 #if MESH_DATA_RESOURCE_PRESENT
-		Ref<Prop2D2DDataMeshData> pdm = prop->get_prop(i);
+		Ref<Prop2DDataMeshData> pdm = prop->get_prop(i);
 
 		if (pdm.is_valid()) {
 			Ref<Texture> tex = pdm->get_texture();
@@ -231,7 +231,7 @@ void Prop2DMaterialCache::prop_remove_textures(const Ref<Prop2DData> &prop) {
 
 	for (int i = 0; i < prop->get_prop_count(); ++i) {
 #if MESH_DATA_RESOURCE_PRESENT
-		Ref<Prop2D2DDataMeshData> pdm = prop->get_prop(i);
+		Ref<Prop2DDataMeshData> pdm = prop->get_prop(i);
 
 		if (pdm.is_valid()) {
 			Ref<Texture> tex = pdm->get_texture();
diff --git a/prop_2d_instance.cpp b/prop_2d_instance.cpp
index 3479b25..1b482b6 100644
--- a/prop_2d_instance.cpp
+++ b/prop_2d_instance.cpp
@@ -207,7 +207,7 @@ void Prop2DInstance::_prop_preprocess(Transform transform, const Ref<Prop2DData>
 		}
 
 #if MESH_DATA_RESOURCE_PRESENT
-		Ref<Prop2D2DDataMeshData> mesh_data = e;
+		Ref<Prop2DDataMeshData> mesh_data = e;
 
 		if (mesh_data.is_valid()) {
 			Ref<MeshDataResource> mdr = mesh_data->get_mesh();
diff --git a/prop_2d_instance_merger.cpp b/prop_2d_instance_merger.cpp
index 6d74af5..f305d65 100644
--- a/prop_2d_instance_merger.cpp
+++ b/prop_2d_instance_merger.cpp
@@ -682,7 +682,7 @@ void Prop2DInstanceMerger::_prop_preprocess(Transform transform, const Ref<Prop2
 		}
 
 #if MESH_DATA_RESOURCE_PRESENT
-		Ref<Prop2D2DDataMeshData> mesh_data = e;
+		Ref<Prop2DDataMeshData> mesh_data = e;
 
 		if (mesh_data.is_valid()) {
 			Ref<MeshDataResource> mdr = mesh_data->get_mesh();
diff --git a/prop_2d_instance_prop_job.cpp b/prop_2d_instance_prop_job.cpp
index 646ed99..81b805a 100644
--- a/prop_2d_instance_prop_job.cpp
+++ b/prop_2d_instance_prop_job.cpp
@@ -122,7 +122,7 @@ void Prop2DInstanceProp2DJob::set_prop_mesher(const Ref<Prop2DMesher> &mesher) {
 }
 
 #if MESH_DATA_RESOURCE_PRESENT
-void Prop2DInstanceProp2DJob::add_mesh(const Ref<Prop2D2DDataMeshData> &mesh_data, const Transform &base_transform) {
+void Prop2DInstanceProp2DJob::add_mesh(const Ref<Prop2DDataMeshData> &mesh_data, const Transform &base_transform) {
 	PMDREntry e;
 	e.mesh_data = mesh_data;
 	e.base_transform = base_transform;
@@ -306,7 +306,7 @@ void Prop2DInstanceProp2DJob::phase_prop() {
 		for (int i = 0; i < _prop_mesh_datas.size(); ++i) {
 			PMDREntry &e = _prop_mesh_datas.write[i];
 
-			Ref<Prop2D2DDataMeshData> pmd = e.mesh_data;
+			Ref<Prop2DDataMeshData> pmd = e.mesh_data;
 
 			Ref<MeshDataResource> mesh = pmd->get_mesh();
 			Ref<Texture> tex = pmd->get_texture();
diff --git a/prop_2d_instance_prop_job.h b/prop_2d_instance_prop_job.h
index 0065684..4a5bfc0 100644
--- a/prop_2d_instance_prop_job.h
+++ b/prop_2d_instance_prop_job.h
@@ -35,7 +35,7 @@ class Prop2DLight;
 class Prop2DDataTiledWall2D;
 
 #if MESH_DATA_RESOURCE_PRESENT
-class Prop2D2DDataMeshData;
+class Prop2DDataMeshData;
 #endif
 
 class Prop2DInstanceProp2DJob : public Prop2DInstanceJob {
@@ -62,7 +62,7 @@ public:
 	void set_prop_mesher(const Ref<Prop2DMesher> &mesher);
 
 #if MESH_DATA_RESOURCE_PRESENT
-	void add_mesh(const Ref<Prop2D2DDataMeshData> &mesh_data, const Transform &base_transform);
+	void add_mesh(const Ref<Prop2DDataMeshData> &mesh_data, const Transform &base_transform);
 	void clear_meshes();
 #endif
 
@@ -102,7 +102,7 @@ protected:
 protected:
 #if MESH_DATA_RESOURCE_PRESENT
 	struct PMDREntry {
-		Ref<Prop2D2DDataMeshData> mesh_data;
+		Ref<Prop2DDataMeshData> mesh_data;
 		Transform base_transform;
 	};
 #endif