Skip to content

Commit 7a7215b

Browse files
committed
#1006 Assume default material is valid for terrain assigment
1 parent 2b8dc2f commit 7a7215b

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

indra/newview/llfloaterregioninfo.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1492,6 +1492,11 @@ bool LLPanelRegionTerrainInfo::validateMaterials()
14921492
const LLUUID& material_asset_id = material_ctrl->getImageAssetID();
14931493
llassert(material_asset_id.notNull());
14941494
if (material_asset_id.isNull()) { return false; }
1495+
if (material_asset_id == BLANK_MATERIAL_ASSET_ID)
1496+
{
1497+
// Default/Blank material is valid by default
1498+
continue;
1499+
}
14951500
const LLFetchedGLTFMaterial* material = gGLTFMaterialList.getMaterial(material_asset_id);
14961501
if (!material->isLoaded())
14971502
{

0 commit comments

Comments
 (0)