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

secondlife/viewer#1006: Prevent PBR terrain material swatches from being null. Default to blank material for now.

meow-7.2.2
Cosmic Linden 2024-03-15 16:43:20 -07:00
parent faa0f36964
commit 7ae7f9554d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llfloaterregioninfo.cpp
View File

@ -62,6 +62,7 @@
#include "llfloaterreg.h"
#include "llfloaterregiondebugconsole.h"
#include "llfloatertelehub.h"
#include "llgltfmateriallist.h"
#include "llinventorymodel.h"
#include "lllineeditor.h"
#include "llnamelistctrl.h"
@ -1394,7 +1395,7 @@ LLPanelRegionTerrainInfo::LLPanelRegionTerrainInfo()
}
for (S32 i = 0; i < LLTerrainMaterials::ASSET_COUNT; ++i)
{
mLastSetMaterials[i] = LLUUID::null;
mLastSetMaterials[i] = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID;
}
}

8
indra/newview/skins/default/xui/en/panel_region_terrain.xml
View File

@ -161,7 +161,7 @@
left="10"
name="material_detail_0"
pick_type="material"
allow_no_texture="true"
default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
top_delta="0"
width="100" />
<texture_picker
@ -172,7 +172,7 @@
left_pad="10"
name="material_detail_1"
pick_type="material"
allow_no_texture="true"
default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
top_delta="0"
width="100" />
<texture_picker
@ -183,7 +183,7 @@
left_pad="10"
name="material_detail_2"
pick_type="material"
allow_no_texture="true"
default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
top_delta="0"
width="100" />
<texture_picker
@ -194,7 +194,7 @@
left_pad="10"
name="material_detail_3"
pick_type="material"
allow_no_texture="true"
default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
top_delta="0"
width="100" />
<text