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

And another merge issue

meow-7.2.2
Ansariel 2018-05-04 22:41:02 +02:00
parent 3ebe1396c9
commit dffe62b00c
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llvovolume.cpp
View File

@ -4688,13 +4688,6 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
tex_mat = facep->mTextureMatrix;
}
// <FS:ND> CEF: if this is a face with media, then use the texture matrix to flip the texture
if( facep->mTextureMatrix &&
( ( facep->getTextureEntry() && facep->getTextureEntry()->hasMedia() ) ||
( facep->getTexture() && facep->getTexture()->getType() == LLViewerTexture::MEDIA_TEXTURE ) ) )
tex_mat = facep->mTextureMatrix;
// </FS:ND>
const LLMatrix4* model_mat = NULL;
LLDrawable* drawable = facep->getDrawable();