Fix for irradiance breaking.

Still need to fix the problem with individual faces getting tossed around though.  Will work on that tomorrow.
DRTVWR-583

3 files changed, 2 insertions, 4 deletions

diff --git a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
index d8118fab82..0152c0612a 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
@@ -217,6 +217,7 @@ void main()
         {
             color = atmosFragLightingLinear(color, additive, atten);
         }
+        color = texture(heroProbes, vec4(norm.xyz * env_mat, 0), 0).xyz;
     }
     else if (!GET_GBUFFER_FLAG(GBUFFER_FLAG_HAS_ATMOS))
     {
@@ -291,9 +292,7 @@ void main()
             color = atmosFragLightingLinear(color, additive, atten);
         }
    }
-
     
-
     #ifdef WATER_FOG
         vec4 fogged = applyWaterFogViewLinear(pos.xyz, vec4(color, bloom));
         color       = fogged.rgb;
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 721b1482d9..9140888cc1 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1035,7 +1035,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
         mComboMatMedia->setEnabled(editable);
 
         LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type");
-
+        
         if (radio_mat_type->getSelectedIndex() < MATTYPE_DIFFUSE)
         {
             radio_mat_type->selectNthItem(MATTYPE_DIFFUSE);
diff --git a/indra/newview/llreflectionmapmanager.cpp b/indra/newview/llreflectionmapmanager.cpp
index 6550686a32..99ebcf5231 100644
--- a/indra/newview/llreflectionmapmanager.cpp
+++ b/indra/newview/llreflectionmapmanager.cpp
@@ -1171,7 +1171,6 @@ void LLReflectionMapManager::setUniforms()
         updateUniforms();
     }
     glBindBufferBase(GL_UNIFORM_BUFFER, 1, mUBO);
-    glBindBufferBase(GL_UNIFORM_BUFFER, 1, mHeroUBO);
 }