diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-21 16:37:03 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-21 16:37:03 -0500 |
| commit | 62208046ae04eb5f6cef01aac1c00c8aafe533b6 (patch) | |
| tree | d59a4286f65525b04f04ff786cdfd0e766375fff /indra/newview/pipeline.cpp | |
| parent | d9c7c925dac3441cd2a05d0055e009693af5b087 (diff) | |
| parent | 58b48137ca1f414286836d567b9f0651880c5995 (diff) | |
merge
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rwxr-xr-x | indra/newview/pipeline.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 404e8cbdb9..bd3b5d05f6 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7884,6 +7884,10 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) if (!LLViewerCamera::getInstance()->cameraUnderWater()) { //generate planar reflection map + + //disable occlusion culling for reflection map for now + S32 occlusion = LLPipeline::sUseOcclusion; + LLPipeline::sUseOcclusion = 0; gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); glClearColor(0,0,0,0); mWaterRef.bindTarget(); @@ -7987,6 +7991,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) glPopMatrix(); mWaterRef.flush(); glh_set_current_modelview(current); + LLPipeline::sUseOcclusion = occlusion; } camera.setOrigin(camera_in.getOrigin()); @@ -9113,11 +9118,6 @@ void LLPipeline::generateSunShadow(LLCamera& camera) fovx = acos(fovx); fovz = acos(fovz); - if (fovx > cutoff || llround(fovz, 0.01f) > cutoff) - { - // llerrs << "WTF?" << llendl; - } - mShadowFOV.mV[j] = cutoff; } |