Skip to content

Commit a5711a2

Browse files
committed
#1759 Fix texture picker using IMG_WHITE for blank materials
1 parent f846861 commit a5711a2

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

indra/newview/lltexturectrl.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1704,10 +1704,16 @@ LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p)
17041704
mDefaultImageName(p.default_image_name),
17051705
mFallbackImage(p.fallback_image)
17061706
{
1707-
1708-
// Default of defaults is white image for diff tex
1709-
//
1710-
setBlankImageAssetID(IMG_WHITE);
1707+
if (mInventoryPickType == PICK_MATERIAL)
1708+
{
1709+
setBlankImageAssetID(BLANK_MATERIAL_ASSET_ID);
1710+
}
1711+
else
1712+
{
1713+
// Default of defaults is white image for diff tex
1714+
//
1715+
setBlankImageAssetID(IMG_WHITE);
1716+
}
17111717

17121718
setAllowNoTexture(p.allow_no_texture);
17131719
setCanApplyImmediately(p.can_apply_immediately);

0 commit comments

Comments
 (0)