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

Fix for sh-2162

meow-7.2.2
prep 2011-07-25 17:42:22 -04:00
parent 4a04458ff5
commit 9395bcee52
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llfloatermodelpreview.cpp
View File

@ -4967,18 +4967,22 @@ BOOL LLModelPreview::render()
if (textures)
{
const std::string& binding = instance.mModel->mMaterialList[i];
const LLImportMaterial& material = instance.mMaterial[binding];
llassert(binding == model->mMaterialList[i]);
glColor4fv(material.mDiffuseColor.mV);
if (material.mDiffuseMap.notNull())
int materialCnt = instance.mModel->mMaterialList.size();
if ( i < materialCnt )
{
if (material.mDiffuseMap->getDiscardLevel() > -1)
const std::string& binding = instance.mModel->mMaterialList[i];
const LLImportMaterial& material = instance.mMaterial[binding];
llassert(binding == model->mMaterialList[i]);
glColor4fv(material.mDiffuseColor.mV);
if (material.mDiffuseMap.notNull())
{
gGL.getTexUnit(0)->bind(material.mDiffuseMap, true);
mTextureSet.insert(material.mDiffuseMap.get());
if (material.mDiffuseMap->getDiscardLevel() > -1)
{
gGL.getTexUnit(0)->bind(material.mDiffuseMap, true);
mTextureSet.insert(material.mDiffuseMap.get());
}
}
}
}