Changed the way indirect lighting is toggled on or of, there was silly problems with previous commit.

jme3-core/src/main/java/com/jme3/material/Material.java

@@ -760,6 +760,7 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable {
         lightData.setVector4Length(numLights * 3);//8 lights * max 3
         Uniform ambientColor = shader.getUniform("g_AmbientLightColor");
         Uniform lightProbeData = shader.getUniform("g_LightProbeData");
+        lightProbeData.setVector4Length(1);
         Uniform lightProbeIrrMap = shader.getUniform("g_IrradianceMap");
         Uniform lightProbePemMap = shader.getUniform("g_PrefEnvMap");
         
@@ -843,12 +844,11 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable {
                         break;
                     case Probe:
                         useIBL = true;
-                        technique.setUseIndirectLighting(true);
                         endIndex++;
                         LightProbe probe = (LightProbe)l;
                         BoundingSphere s = (BoundingSphere)probe.getBounds();                        
-                        tmpVec.set(probe.getPosition().x, probe.getPosition().y, probe.getPosition().z, 1f/s.getRadius());
+                        lightProbeData.setVector4InArray(probe.getPosition().x, probe.getPosition().y, probe.getPosition().z, 1f/s.getRadius(), 0);
-                        lightProbeData.setValue(VarType.Vector4, tmpVec);                        
+                        
                         //assigning new texture indexes if they have never been assigned.
                         if( irrUnit == -1 ){
                             irrUnit = nextTexUnit++;
@@ -866,7 +866,8 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable {
         vars.release();
         
         if(!useIBL ){            
-            technique.setUseIndirectLighting(false);            
+            //Disable IBL for this pass
+            lightProbeData.setVector4InArray(0,0,0,-1, 0);
         }
         //Padding of unsued buffer space
         while(lightDataIndex < numLights * 3) {

jme3-core/src/main/java/com/jme3/material/Technique.java

@@ -188,15 +188,6 @@ public class Technique /* implements Savable */ {
         }
     }
     
-    public void setUseIndirectLighting(boolean useIBL){
-        if(useIBL){
-            defines.set("INDIRECT_LIGHTING", VarType.Boolean, true);
-        }else{
-            defines.remove("INDIRECT_LIGHTING");
-        }
-        needReload = true;
-    }
-
     private void loadShader(AssetManager manager,EnumSet<Caps> rendererCaps) {
         
         ShaderKey key = new ShaderKey(getAllDefines(),def.getShaderProgramLanguages(),def.getShaderProgramNames());

jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.frag

@@ -23,7 +23,7 @@ varying vec3 wPosition;
 //  uniform sampler2D m_IntegrateBRDF;
   uniform samplerCube g_PrefEnvMap;
   uniform samplerCube g_IrradianceMap;
-  uniform vec4 g_ProbeData;
+  uniform vec4 g_LightProbeData;
 //#endif
 
 #ifdef BASECOLORMAP
@@ -202,10 +202,9 @@ void main(){
         gl_FragColor.rgb += directLighting * fallOff;
     }
 
-    #ifdef INDIRECT_LIGHTING
     vec3 rv = reflect(-viewDir.xyz, normal.xyz);
     //prallax fix for spherical bounds.
-        rv = g_ProbeData.w * (wPosition - g_ProbeData.xyz) +rv;
+    rv = g_LightProbeData.w * (wPosition - g_LightProbeData.xyz) +rv;
 
      //horizon fade from http://marmosetco.tumblr.com/post/81245981087
     float horiz = dot(rv, wNormal.xyz);
@@ -222,8 +221,7 @@ void main(){
 
     vec3 indirectLighting =  indirectDiffuse + indirectSpecular;
 
-        gl_FragColor.rgb = gl_FragColor.rgb + indirectLighting ;        
+    gl_FragColor.rgb = gl_FragColor.rgb + indirectLighting * step( 0.0, g_LightProbeData.w);        
-    #endif
  
     #if defined(EMISSIVE) || defined (EMISSIVEMAP)
         #ifdef EMISSIVEMAP