SL-11102, SL-11103

Fix diffuse boost in deferred lighting to match non-deferred.

Make class2 soften not clamp shadow color to incoming alpha (make shadows appear on terrain underwater).

1 files changed, 4 insertions, 9 deletions

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 3277a6ed32..c57b267c92 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -2327,8 +2327,6 @@ bool LLPipeline::getVisibleExtents(LLCamera& camera, LLVector3& min, LLVector3&
 	LLViewerCamera::eCameraID saved_camera_id = LLViewerCamera::sCurCameraID;
 	LLViewerCamera::sCurCameraID = LLViewerCamera::CAMERA_WORLD;
 
-	bool res = true;
-
 	for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
 			iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
 	{
@@ -2339,20 +2337,17 @@ bool LLPipeline::getVisibleExtents(LLCamera& camera, LLVector3& min, LLVector3&
 			LLSpatialPartition* part = region->getSpatialPartition(i);
 			if (part)
 			{
-				if (hasRenderType(part->mDrawableType))
+				if (hasRenderType(part->mDrawableType) && !part->getVisibleExtents(camera, min, max))
 				{
-					if (!part->getVisibleExtents(camera, min, max))
-					{
-						res = false;
-					}
+					LLViewerCamera::sCurCameraID = saved_camera_id;
+                    return false;
 				}
 			}
 		}
 	}
 
 	LLViewerCamera::sCurCameraID = saved_camera_id;
-
-	return res;
+	return true;
 }
 
 static LLTrace::BlockTimerStatHandle FTM_CULL("Object Culling");