From fe4ff0d86c0edcc54458673c5d1c6ef2fe1e0cce Mon Sep 17 00:00:00 2001 From: Relintai Date: Wed, 9 Feb 2022 00:34:46 +0100 Subject: [PATCH] Fix SpatialMaterial support for the merger libraries. --- library/terrain_library_merger.cpp | 12 ++++++++++++ library/terrain_library_merger_pcm.cpp | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/library/terrain_library_merger.cpp b/library/terrain_library_merger.cpp index 8c85402..9e71dd2 100644 --- a/library/terrain_library_merger.cpp +++ b/library/terrain_library_merger.cpp @@ -327,6 +327,18 @@ void TerrainLibraryMerger::_setup_material_albedo(const int material_index, cons Ref spmat; + switch (material_index) { + case MATERIAL_INDEX_TERRAIN: + spmat = material_get(i); + break; + case MATERIAL_INDEX_LIQUID: + spmat = liquid_material_get(i); + break; + case MATERIAL_INDEX_PROP: + spmat = prop_material_get(i); + break; + } + if (spmat.is_valid()) { spmat->set_texture(SpatialMaterial::TEXTURE_ALBEDO, texture); return; diff --git a/library/terrain_library_merger_pcm.cpp b/library/terrain_library_merger_pcm.cpp index 56afb1a..8561a31 100644 --- a/library/terrain_library_merger_pcm.cpp +++ b/library/terrain_library_merger_pcm.cpp @@ -670,6 +670,18 @@ void TerrainLibraryMergerPCM::_setup_material_albedo(const int material_index, c Ref spmat; + switch (material_index) { + case MATERIAL_INDEX_TERRAIN: + spmat = material_get(i); + break; + case MATERIAL_INDEX_LIQUID: + spmat = liquid_material_get(i); + break; + case MATERIAL_INDEX_PROP: + spmat = prop_material_get(i); + break; + } + if (spmat.is_valid()) { spmat->set_texture(SpatialMaterial::TEXTURE_ALBEDO, texture); return;