Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't batch faces that are animating, ever (hopefully). Should fix texture animations breaking when rendermaxtextureindex > 1

Browse Source
This commit is contained in:
Shyotl
2012-07-24 20:18:35 -05:00
parent 21f6174846
commit eeea2b4de4
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llvovolume.cpp
View File

@@ -4165,11 +4165,16 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
facep->setTextureIndex(cur_tex); facep->setTextureIndex(cur_tex);
texture_list.push_back(tex); texture_list.push_back(tex);
//if (can_batch_texture(facep)) if (can_batch_texture(facep))
{ {
while (i != faces.end()) while (i != faces.end())
{ {
facep = *i; facep = *i;
if (!can_batch_texture(facep))
{ //face is bump mapped or has an animated texture matrix -- can't
//batch more than 1 texture at a time
break;
}
if (facep->getTexture() != tex) if (facep->getTexture() != tex)
{ {
if (distance_sort) if (distance_sort)
@@ -4195,12 +4200,6 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
cur_tex++; cur_tex++;
} }
if (!can_batch_texture(facep))
{ //face is bump mapped or has an animated texture matrix -- can't
//batch more than 1 texture at a time
break;
}
if (cur_tex >= texture_index_channels) if (cur_tex >= texture_index_channels)
{ //cut batches when index channels are depleted { //cut batches when index channels are depleted
break; break;
@@ -4222,9 +4221,8 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
facep->setTextureIndex(cur_tex); facep->setTextureIndex(cur_tex);
} }
tex = texture_list[0];
} }
tex = texture_list[0];
} }
else else
{ {