diff options
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 50 |
1 files changed, 1 insertions, 49 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 1784fccf1f..56dc61c1a3 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -556,30 +556,7 @@ void LLDrawPoolBump::renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL for (LLSpatialGroup::drawmap_elem_t::iterator k = draw_info.begin(); k != draw_info.end(); ++k) { LLDrawInfo& params = **k; - if (LLPipeline::sDynamicReflections) - { - if (params.mReflectionMap.notNull()) - { - params.mReflectionMap->bind(); - } - else - { - if (params.mModelMatrix) - { - sCubeMap = gPipeline.findReflectionMap(params.mModelMatrix->getTranslation()); - } - - if (sCubeMap) - { - sCubeMap->bind(); - } - else if (gSky.mVOSkyp->getCubeMap()) - { - gSky.mVOSkyp->getCubeMap()->bind(); - } - } - } - + applyModelMatrix(params); params.mVertexBuffer->setBuffer(mask); @@ -607,10 +584,6 @@ BOOL LLDrawPoolBump::bindBumpMap(LLDrawInfo& params) if( tex ) { bump = gBumpImageList.getBrightnessDarknessImage( tex, bump_code ); - //------------------------------------------ - //error check to make sure bump is valid - llassert_always(!bump || bump->getNumRefs() == 1) ; - //------------------------------------------ } break; @@ -625,11 +598,6 @@ BOOL LLDrawPoolBump::bindBumpMap(LLDrawInfo& params) if (bump) { - //------------------------------------------ - //error check to make sure bump is valid - llassert_always(bump->getNumRefs() > 0 && bump->getNumRefs() < 100000) ; - //------------------------------------------ - bump->bind(1); bump->bind(0); return TRUE; @@ -1121,22 +1089,6 @@ void LLDrawPoolBump::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture) { LLImageGL::unbindTexture(0); } - - if (LLPipeline::sDynamicReflections) - { - LLCubeMap* cube_map = params.mReflectionMap; - - if (!cube_map && params.mModelMatrix) - { - cube_map = gPipeline.findReflectionMap(params.mModelMatrix->getTranslation()); - } - - if (cube_map) - { - cube_map->enableTexture(cube_channel); - cube_map->bind(); - } - } } params.mVertexBuffer->setBuffer(mask); |