From c6cf44f2bb063dab2c198da902882e1aa7c2870e Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Thu, 24 Feb 2022 10:43:54 +0100
Subject: [PATCH] Comment out unnecessary merging code in the PCM library.

---
 library/terrain_library_merger_pcm.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/library/terrain_library_merger_pcm.cpp b/library/terrain_library_merger_pcm.cpp
index 628168e..4f93c92 100644
--- a/library/terrain_library_merger_pcm.cpp
+++ b/library/terrain_library_merger_pcm.cpp
@@ -616,6 +616,7 @@ Ref<TexturePacker> TerrainLibraryMergerPCM::get_prop_packer() {
 #endif
 
 void TerrainLibraryMergerPCM::refresh_rects() {
+	/*
 	bool texture_added = false;
 	for (int i = 0; i < _terra_surfaces.size(); i++) {
 		Ref<TerrainSurfaceMerger> surface = Ref<TerrainSurfaceMerger>(_terra_surfaces[i]);
@@ -679,11 +680,12 @@ void TerrainLibraryMergerPCM::refresh_rects() {
 			surface->refresh_rects();
 		}
 	}
-
+*/
 	set_initialized(true);
 }
 
 void TerrainLibraryMergerPCM::_setup_material_albedo(const int material_index, const Ref<Texture> &texture) {
+	/*
 	Ref<SpatialMaterial> mat;
 
 	int count = 0;
@@ -750,6 +752,7 @@ void TerrainLibraryMergerPCM::_setup_material_albedo(const int material_index, c
 			shmat->set_shader_param("texture_albedo", texture);
 		}
 	}
+	*/
 }
 
 TerrainLibraryMergerPCM::TerrainLibraryMergerPCM() {
@@ -798,6 +801,7 @@ TerrainLibraryMergerPCM::~TerrainLibraryMergerPCM() {
 
 #ifdef PROPS_PRESENT
 bool TerrainLibraryMergerPCM::process_prop_textures(Ref<PropData> prop) {
+	/*
 	if (!prop.is_valid()) {
 		return false;
 	}
@@ -828,6 +832,9 @@ bool TerrainLibraryMergerPCM::process_prop_textures(Ref<PropData> prop) {
 	}
 
 	return texture_added;
+	*/
+
+	return false;
 }
 #endif