livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#1006 Assume default material is valid for terrain assigment

master
Andrey Kleshchev 2025-11-05 14:22:09 +02:00
parent 2b8dc2f02a
commit 7a7215b852
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfloaterregioninfo.cpp
View File

@ -1492,6 +1492,11 @@ bool LLPanelRegionTerrainInfo::validateMaterials()
const LLUUID& material_asset_id = material_ctrl->getImageAssetID(); const LLUUID& material_asset_id = material_ctrl->getImageAssetID();
llassert(material_asset_id.notNull()); llassert(material_asset_id.notNull());
if (material_asset_id.isNull()) { return false; } if (material_asset_id.isNull()) { return false; }
if (material_asset_id == BLANK_MATERIAL_ASSET_ID)
{
// Default/Blank material is valid by default
continue;
}
const LLFetchedGLTFMaterial* material = gGLTFMaterialList.getMaterial(material_asset_id); const LLFetchedGLTFMaterial* material = gGLTFMaterialList.getMaterial(material_asset_id);
if (!material->isLoaded()) if (!material->isLoaded())
{ {