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

FIRE-13465; do not try to use a non-existant material.

Nicky 2014-04-22 14:33:40 +02:00
parent 1c57cfee7a
commit 09771cf85d
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llfloatermodelpreview.cpp
View File

@ -5662,6 +5662,12 @@ BOOL LLModelPreview::render()
position[j] = v;
}
// <FS:ND> FIRE-13465 Make sure there's a material set before dereferencing it
if( instance.mModel->mMaterialList.size() > i &&
instance.mMaterial.end() != instance.mMaterial.find( instance.mModel->mMaterialList[ i ] ) )
{
// </FS:ND>
const std::string& binding = instance.mModel->mMaterialList[i];
const LLImportMaterial& material = instance.mMaterial[binding];
@ -5676,7 +5682,14 @@ BOOL LLModelPreview::render()
gGL.getTexUnit(0)->bind(material.mDiffuseMap, true);
mTextureSet.insert(material.mDiffuseMap.get());
}
}
} else // <FS:ND> FIRE-13465 Make sure there's a material set before dereferencing it, if none, set buffer type and unbind texture.
{
buffer->setBuffer(type_mask & buffer->getTypeMask());
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
} // </FS:ND>
buffer->draw(LLRender::TRIANGLES, buffer->getNumIndices(), 0);
gGL.diffuseColor3f(0.4f, 0.4f, 0.4f);