Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

This commit is contained in:
Latif Khalifa
2014-03-28 08:45:40 +01:00
35 changed files with 397 additions and 161 deletions

View File

@@ -1529,6 +1529,7 @@ static LLFastTimer::DeclareTimer FTM_OCCLUSION_DRAW("Draw");
void LLSpatialGroup::doOcclusion(LLCamera* camera)
{
LLGLDisable stencil(GL_STENCIL_TEST);
if (mSpatialPartition->isOcclusionEnabled() && LLPipeline::sUseOcclusion > 1)
{
//static const LLCachedControl<BOOL> render_water_void_culling("RenderWaterVoidCulling", TRUE);
@@ -3868,6 +3869,8 @@ public:
return;
}
LLGLDisable stencil(GL_STENCIL_TEST);
group->rebuildGeom();
group->rebuildMesh();