aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-09-08 20:50:39 -0700
committerMcCabe Maxsted2011-09-08 20:50:39 -0700
commit0b707d43d1d04808e3354b9bf1dc35d380c286be (patch)
tree23ab929deccaab3fd6820227035a36d89bbb17de /linden/indra/newview/pipeline.cpp
parentFixed snapshot Capture combo (diff)
downloadmeta-impy-0b707d43d1d04808e3354b9bf1dc35d380c286be.zip
meta-impy-0b707d43d1d04808e3354b9bf1dc35d380c286be.tar.gz
meta-impy-0b707d43d1d04808e3354b9bf1dc35d380c286be.tar.bz2
meta-impy-0b707d43d1d04808e3354b9bf1dc35d380c286be.tar.xz
Backout of the sculptie derender patch ported from FireStorm
This also reverts 14f4622c and 534767ef
Diffstat (limited to 'linden/indra/newview/pipeline.cpp')
-rw-r--r--linden/indra/newview/pipeline.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index ae0e605..cd9b3be 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -258,7 +258,6 @@ BOOL LLPipeline::sRenderAttachedLights = TRUE;
258BOOL LLPipeline::sRenderAttachedParticles = TRUE; 258BOOL LLPipeline::sRenderAttachedParticles = TRUE;
259BOOL LLPipeline::sRenderDeferred = FALSE; 259BOOL LLPipeline::sRenderDeferred = FALSE;
260S32 LLPipeline::sVisibleLightCount = 0; 260S32 LLPipeline::sVisibleLightCount = 0;
261F32 LLPipeline::sSculptSurfaceAreaFrame = 0.0;
262 261
263static LLCullResult* sCull = NULL; 262static LLCullResult* sCull = NULL;
264 263
@@ -2199,8 +2198,6 @@ void LLPipeline::postSort(LLCamera& camera)
2199 LLFastTimer ftm(LLFastTimer::FTM_STATESORT_POSTSORT); 2198 LLFastTimer ftm(LLFastTimer::FTM_STATESORT_POSTSORT);
2200 2199
2201 assertInitialized(); 2200 assertInitialized();
2202
2203 sSculptSurfaceAreaFrame = 0.0;
2204 2201
2205 //rebuild drawable geometry 2202 //rebuild drawable geometry
2206 for (LLCullResult::sg_list_t::iterator i = sCull->beginDrawableGroups(); i != sCull->endDrawableGroups(); ++i) 2203 for (LLCullResult::sg_list_t::iterator i = sCull->beginDrawableGroups(); i != sCull->endDrawableGroups(); ++i)