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

Removed unnecessary lighting assertions. Fixed compiler warning.

Browse Source
This commit is contained in:
Shyotl
2019-07-23 20:49:17 -05:00
parent 1bd6ba61a7
commit ea2b1e179e
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llvieweroctree.cpp
View File

@@ -460,7 +460,7 @@ LLViewerOctreeGroup::LLViewerOctreeGroup(OctreeNode* node) :
{
LLVector4a tmp;
tmp.splat(0.f);
mExtents[0] = mExtents[1] = mObjectBounds[0] = mObjectBounds[0] = mObjectBounds[1] =
mExtents[0] = mExtents[1] = mObjectBounds[0] = mObjectBounds[1] =
mObjectExtents[0] = mObjectExtents[1] = tmp;
mBounds[0] = node->getCenter();

6
indra/newview/pipeline.cpp
View File

@@ -4146,7 +4146,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
if (!gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_HUD))
{
updateHWLightMode(LIGHT_MODE_NORMAL);
llassert_always(LLGLState<GL_LIGHTING>::checkEnabled());
llassert(LLGLState<GL_LIGHTING>::checkEnabled());
}
BOOL occlude = sUseOcclusion > 1;
@@ -4423,8 +4423,6 @@ void LLPipeline::renderGeomPostDeferred(LLCamera& camera, bool do_occlusion)
updateHWLightMode(LIGHT_MODE_NORMAL);
llassert_always(LLGLState<GL_LIGHTING>::checkEnabled());
gGL.setColorMask(true, false);
pool_set_t::iterator iter1 = mPools.begin();
@@ -8280,8 +8278,6 @@ void LLPipeline::renderDeferredLightingToRT(LLRenderTarget* target)
glh_get_current_modelview().rotate(mTransformedSunDir,mTransformedSunDir);
}
llassert_always(LLGLState<GL_LIGHTING>::checkEnabled());
gGL.pushMatrix();
gGL.loadIdentity();
gGL.matrixMode(LLRender::MM_PROJECTION);