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

Initial support for the Clang compiler and numerous warning fixes

Browse Source
This commit is contained in:
Drake Arconis
2012-07-02 19:45:41 +00:00
parent 5f98e24efe
commit ece9dda7b4
17 changed files with 169 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llvovolume.cpp
View File

@@ -3430,7 +3430,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
}
if (vobj->isMesh() &&
(vobj->getVolume() && !vobj->getVolume()->isMeshAssetLoaded() || !gMeshRepo.meshRezEnabled()))
((vobj->getVolume() && !vobj->getVolume()->isMeshAssetLoaded()) || !gMeshRepo.meshRezEnabled()))
{
continue;
}
@@ -4152,7 +4152,7 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
}
else
{ //resize pre-existing buffer
if (LLVertexBuffer::sEnableVBOs && buffer->getUsage() != buffer_usage ||
if ((LLVertexBuffer::sEnableVBOs && buffer->getUsage() != buffer_usage) ||
buffer->getTypeMask() != mask)
{
buffer = createVertexBuffer(mask, buffer_usage);