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

Another fix for the VRAM calculation in inspect floater

Ansariel 2017-11-24 10:58:52 +01:00
parent 9592d7fa47
commit ac6fe520d9
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llfloaterinspect.cpp
View File

@ -511,11 +511,10 @@ U32 LLFloaterInspect::getObjectVRAM(LLViewerObject* object)
for (U8 j = 0; j < te_count; j++)
{
LLViewerTexture* img = object->getTEImage(j);
if (!img)
if (img)
{
continue;
memory += addToVRAMTexList(img, object_texture_list);
}
memory += addToVRAMTexList(img, object_texture_list);
// materials per face
if (object->getTE(j)->getMaterialParams().notNull())
@ -524,22 +523,20 @@ U32 LLFloaterInspect::getObjectVRAM(LLViewerObject* object)
if (uuid.notNull())
{
LLViewerTexture* img = gTextureList.getImage(uuid);
if (!img)
if (img)
{
continue;
memory += addToVRAMTexList(img, object_texture_list);
}
memory += addToVRAMTexList(img, object_texture_list);
}
uuid = object->getTE(j)->getMaterialParams()->getSpecularID();
if (uuid.notNull())
{
LLViewerTexture* img = gTextureList.getImage(uuid);
if (!img)
if (img)
{
continue;
memory += addToVRAMTexList(img, object_texture_list);
}
memory += addToVRAMTexList(img, object_texture_list);
}
}
}