Relintai/terraman
1
0
Fork 0
mirror of https://github.com/Relintai/terraman.git synced 2025-04-25 21:45:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix SpatialMaterial support for the merger libraries.

Browse Source
This commit is contained in:
Relintai 2022-02-09 00:34:46 +01:00
parent bbcff1257e
commit fe4ff0d86c
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/terrain_library_merger.cpp
View File

@ -327,6 +327,18 @@ void TerrainLibraryMerger::_setup_material_albedo(const int material_index, cons
Ref<SpatialMaterial> 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;

12
library/terrain_library_merger_pcm.cpp
View File

@ -670,6 +670,18 @@ void TerrainLibraryMergerPCM::_setup_material_albedo(const int material_index, c
Ref<SpatialMaterial> 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;