diff options
| author | Armin Weatherwax | 2010-08-25 19:09:26 +0200 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-28 05:01:53 -0700 |
| commit | 494c00f56bd89d6d7371990bb8cc98243694b7d3 (patch) | |
| tree | 96e3514f59ebc6cdcf95761d84882735231bc2ad | |
| parent | fix leak if lightshare message not valid (diff) | |
| download | meta-impy-494c00f56bd89d6d7371990bb8cc98243694b7d3.zip meta-impy-494c00f56bd89d6d7371990bb8cc98243694b7d3.tar.gz meta-impy-494c00f56bd89d6d7371990bb8cc98243694b7d3.tar.bz2 meta-impy-494c00f56bd89d6d7371990bb8cc98243694b7d3.tar.xz | |
SG1.4: fix ressource waste in non-wl sky rendering
| -rw-r--r-- | linden/indra/newview/pipeline.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp index 14896e1..f10aca5 100644 --- a/linden/indra/newview/pipeline.cpp +++ b/linden/indra/newview/pipeline.cpp | |||
| @@ -1417,20 +1417,15 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl | |||
| 1417 | 1417 | ||
| 1418 | camera.disableUserClipPlane(); | 1418 | camera.disableUserClipPlane(); |
| 1419 | 1419 | ||
| 1420 | if (gSky.mVOSkyp.notNull() && gSky.mVOSkyp->mDrawable.notNull()) | 1420 | // Render non-windlight sky. |
| 1421 | { | 1421 | if (hasRenderType(LLPipeline::RENDER_TYPE_SKY) && |
| 1422 | // Hack for sky - always visible. | 1422 | gSky.mVOSkyp.notNull() && |
| 1423 | if (hasRenderType(LLPipeline::RENDER_TYPE_SKY)) | 1423 | gSky.mVOSkyp->mDrawable.notNull()) |
| 1424 | { | 1424 | { |
| 1425 | gSky.mVOSkyp->mDrawable->setVisible(camera); | 1425 | gSky.mVOSkyp->mDrawable->setVisible(camera); |
| 1426 | sCull->pushDrawable(gSky.mVOSkyp->mDrawable); | 1426 | sCull->pushDrawable(gSky.mVOSkyp->mDrawable); |
| 1427 | gSky.updateCull(); | 1427 | gSky.updateCull(); |
| 1428 | stop_glerror(); | 1428 | stop_glerror(); |
| 1429 | } | ||
| 1430 | } | ||
| 1431 | else | ||
| 1432 | { | ||
| 1433 | llinfos << "No sky drawable!" << llendl; | ||
| 1434 | } | 1429 | } |
| 1435 | 1430 | ||
| 1436 | if (hasRenderType(LLPipeline::RENDER_TYPE_GROUND) && | 1431 | if (hasRenderType(LLPipeline::RENDER_TYPE_GROUND) && |