SH-571 Fix for shadows disappearing for a frame whenever an object switches octree nodes. Regressed EXT-7155 so fix for regression included.

6 files changed, 12 insertions, 42 deletions

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 086702de87..73c4cf94ef 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -763,7 +763,7 @@ void LLDrawable::updateTexture()
 
 	if (getVOVolume())
 	{
-		if (isActive())
+		/*if (isActive())
 		{
 			if (isRoot())
 			{
@@ -773,7 +773,7 @@ void LLDrawable::updateTexture()
 			{
 				getParent()->mQuietCount = 0;
 			}
-		}
+		}*/
 				
 		gPipeline.markRebuild(this, LLDrawable::REBUILD_MATERIAL, TRUE);
 	}
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index bd2c6e1c63..0afa8b1794 100644
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -145,12 +145,7 @@ void LLStandardBumpmap::addstandard()
 // 		llinfos << "Loading bumpmap: " << bump_image_id << " from viewerart" << llendl;
 		gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mLabel = label;
 		gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage = 
-			LLViewerTextureManager::getFetchedTexture(LLUUID(bump_image_id),
-										TRUE, 
-										LLViewerTexture::BOOST_NONE, 
-										LLViewerTexture::LOD_TEXTURE,
-										0, 
-										0);									
+			LLViewerTextureManager::getFetchedTexture(LLUUID(bump_image_id));	
 		gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage->setBoostLevel(LLViewerTexture::BOOST_BUMP) ;
 		gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage->setLoadedCallback(LLBumpImageList::onSourceStandardLoaded, 0, TRUE, FALSE, NULL, NULL );
 		LLStandardBumpmap::sStandardBumpmapCount++;
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 527f400c03..8ad38c1789 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -755,7 +755,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 		{

 			LLViewerCamera::sCurCameraID = LLViewerCamera::CAMERA_WORLD;

 			LLMemType mt_ss(LLMemType::MTYPE_DISPLAY_STATE_SORT);

-			gPipeline.sAllowRebuildPriorityGroup = TRUE ;

 			gPipeline.stateSort(*LLViewerCamera::getInstance(), result);

 			stop_glerror();

 				

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 71ebcf4c9f..5277e073a3 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -857,7 +857,8 @@ void LLVOVolume::updateTextureVirtualSize()
 

 BOOL LLVOVolume::isActive() const

 {

-	return !mStatic || mTextureAnimp || (mVolumeImpl && mVolumeImpl->isActive());

+	return !mStatic || mTextureAnimp || (mVolumeImpl && mVolumeImpl->isActive()) || 

+		(mDrawable.notNull() && mDrawable->isActive());

 }

 

 BOOL LLVOVolume::setMaterial(const U8 material)

@@ -3281,28 +3282,6 @@ F32 LLVOVolume::getBinRadius()
 	

 	F32 scale = 1.f;

 

-	if (isSculpted())

-	{

-		LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);

-		LLUUID id =  sculpt_params->getSculptTexture();

-		U8 sculpt_type = sculpt_params->getSculptType();

-

-		if ((sculpt_type & LL_SCULPT_TYPE_MASK) == LL_SCULPT_TYPE_MESH)

-			// mesh is a mesh

-		{

-			LLVolume* volume = getVolume();

-			U32 vert_count = 0;

-

-			for (S32 i = 0; i < volume->getNumVolumeFaces(); ++i)

-			{

-				const LLVolumeFace& face = volume->getVolumeFace(i);

-				vert_count += face.mNumVertices;

-			}

-

-			scale = 1.f/llmax(vert_count/1024.f, 1.f);

-		}

-	}

-

 	const LLVector4a* ext = mDrawable->getSpatialExtents();

 	

 	BOOL shrink_wrap = mDrawable->isAnimating();

@@ -4395,6 +4374,7 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group)
 			{

 				LLVOVolume* vobj = drawablep->getVOVolume();

 				vobj->preRebuild();

+

 				LLVolume* volume = vobj->getVolume();

 				for (S32 i = 0; i < drawablep->getNumFaces(); ++i)

 				{

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 2488e80bfb..c1b3ad99b2 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -284,7 +284,6 @@ BOOL	LLPipeline::sRenderFrameTest = FALSE;
 BOOL	LLPipeline::sRenderAttachedLights = TRUE;
 BOOL	LLPipeline::sRenderAttachedParticles = TRUE;
 BOOL	LLPipeline::sRenderDeferred = FALSE;
-BOOL    LLPipeline::sAllowRebuildPriorityGroup = FALSE ;
 S32		LLPipeline::sVisibleLightCount = 0;
 F32		LLPipeline::sMinRenderSize = 0.f;
 
@@ -2112,12 +2111,6 @@ void LLPipeline::updateGL()
 
 void LLPipeline::rebuildPriorityGroups()
 {
-	if(!sAllowRebuildPriorityGroup)
-	{
-		return ;
-	}
-	sAllowRebuildPriorityGroup = FALSE ;
-
 	LLTimer update_timer;
 	LLMemType mt(LLMemType::MTYPE_PIPELINE);
 	
@@ -2502,6 +2495,11 @@ void LLPipeline::markRebuild(LLDrawable *drawablep, LLDrawable::EDrawableFlags f
 {
 	LLMemType mt(LLMemType::MTYPE_PIPELINE_MARK_REBUILD);
 
+	if (drawablep)
+	{
+		LLVOVolume* volume = drawablep->getVOVolume();
+	}
+
 	if (drawablep && !drawablep->isDead() && assertInitialized())
 	{
 		if (!drawablep->isState(LLDrawable::BUILT))
@@ -2635,7 +2633,7 @@ void LLPipeline::stateSort(LLSpatialGroup* group, LLCamera& camera)
 void LLPipeline::stateSort(LLSpatialBridge* bridge, LLCamera& camera)
 {
 	LLMemType mt(LLMemType::MTYPE_PIPELINE_STATE_SORT);
-	if (!sShadowRender && bridge->getSpatialGroup()->changeLOD())
+	if (bridge->getSpatialGroup()->changeLOD())
 	{
 		bool force_update = false;
 		bridge->updateDistance(camera, force_update);
@@ -6139,7 +6137,6 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
 		LLGLDisable blend(GL_BLEND);
 		bindDeferredShader(*shader);
 
-
 		//depth of field focal plane calculations
 
 		F32 subject_distance = 16.f;
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 61264d380a..7ae83e9816 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -506,7 +506,6 @@ public:
 	static BOOL				sRenderAttachedLights;
 	static BOOL				sRenderAttachedParticles;
 	static BOOL				sRenderDeferred;
-	static BOOL             sAllowRebuildPriorityGroup;
 	static S32				sVisibleLightCount;
 	static F32				sMinRenderSize;