From 7c815f26b0dc6098da37d7b2c9d49e42f97392dd Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Tue, 10 Aug 2021 10:19:03 +0200
Subject: [PATCH] Removed the merge_textures property from PropInstanceMerger.

---
 prop_instance_merger.cpp | 16 ----------------
 prop_instance_merger.h   |  9 ---------
 2 files changed, 25 deletions(-)

diff --git a/prop_instance_merger.cpp b/prop_instance_merger.cpp
index 051b354..2304a1e 100644
--- a/prop_instance_merger.cpp
+++ b/prop_instance_merger.cpp
@@ -66,16 +66,6 @@ void PropInstanceMerger::set_job(const Ref<PropInstanceJob> &job) {
 	_job = job;
 }
 
-#ifdef TEXTURE_PACKER_PRESENT
-bool PropInstanceMerger::get_merge_textures() const {
-	return _merge_textures;
-}
-
-void PropInstanceMerger::set_merge_textures(const bool value) {
-	_merge_textures = value;
-}
-#endif
-
 //Materials
 Ref<Material> PropInstanceMerger::material_get(const int index) {
 	ERR_FAIL_INDEX_V(index, _materials.size(), Ref<Material>(NULL));
@@ -624,12 +614,6 @@ void PropInstanceMerger::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_job", "value"), &PropInstanceMerger::set_job);
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "job", PROPERTY_HINT_RESOURCE_TYPE, "PropInstanceJob", 0), "set_job", "get_job");
 
-#ifdef TEXTURE_PACKER_PRESENT
-	ClassDB::bind_method(D_METHOD("get_merge_textures"), &PropInstanceMerger::get_merge_textures);
-	ClassDB::bind_method(D_METHOD("set_merge_textures", "value"), &PropInstanceMerger::set_merge_textures);
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "merge_textures"), "set_merge_textures", "get_merge_textures");
-#endif
-
 	///Materials
 	ClassDB::bind_method(D_METHOD("material_get", "index"), &PropInstanceMerger::material_get);
 	ClassDB::bind_method(D_METHOD("material_add", "value"), &PropInstanceMerger::material_add);
diff --git a/prop_instance_merger.h b/prop_instance_merger.h
index fb779c1..44fc2fe 100644
--- a/prop_instance_merger.h
+++ b/prop_instance_merger.h
@@ -50,11 +50,6 @@ public:
 	Ref<PropInstanceJob> get_job();
 	void set_job(const Ref<PropInstanceJob> &job);
 
-#ifdef TEXTURE_PACKER_PRESENT
-	bool get_merge_textures() const;
-	void set_merge_textures(const bool value);
-#endif
-
 	///Materials
 	Ref<Material> material_get(const int index);
 	void material_add(const Ref<Material> &value);
@@ -141,10 +136,6 @@ private:
 
 	Ref<PropInstancePropJob> _job;
 
-#ifdef TEXTURE_PACKER_PRESENT
-	bool _merge_textures;
-#endif
-
 	Vector<Ref<Material> > _materials;
 	Vector<MeshEntry> _meshes;
 	Vector<ColliderBody> _colliders;