From 5a3f191135d233da288b28de81e00ecd9d5264a9 Mon Sep 17 00:00:00 2001
From: "sha..rd" <shadowislord@gmail.com>
Date: Sat, 3 Sep 2011 18:52:56 +0000
Subject: [PATCH]  * Reverted r8152, r8157 and r8158

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8159 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 engine/src/core/com/jme3/material/MatParam.java            | 7 +++++++
 engine/src/core/com/jme3/shader/VarType.java               | 2 --
 .../lwjgl-ogl/com/jme3/renderer/lwjgl/LwjglRenderer.java   | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/engine/src/core/com/jme3/material/MatParam.java b/engine/src/core/com/jme3/material/MatParam.java
index ee788fd7f..d81afa83b 100644
--- a/engine/src/core/com/jme3/material/MatParam.java
+++ b/engine/src/core/com/jme3/material/MatParam.java
@@ -181,6 +181,10 @@ public class MatParam implements Savable, Cloneable {
             case Vector2:
                 Vector2f v2 = (Vector2f) value;
                 return v2.getX() + " " + v2.getY();
+/* 
+This may get used at a later point of time
+When arrays can be inserted in J3M files
+
             case Vector2Array:
                 Vector2f[] v2Arr = (Vector2f[]) value;
                 String v2str = "";
@@ -188,9 +192,11 @@ public class MatParam implements Savable, Cloneable {
                     v2str += v2Arr[i].getX() + " " + v2Arr[i].getY() + "\n";
                 }
                 return v2str;
+*/
             case Vector3:
                 Vector3f v3 = (Vector3f) value;
                 return v3.getX() + " " + v3.getY() + " " + v3.getZ();
+/*
             case Vector3Array:
                 Vector3f[] v3Arr = (Vector3f[]) value;
                 String v3str = "";
@@ -235,6 +241,7 @@ public class MatParam implements Savable, Cloneable {
                 } else {
                     throw new UnsupportedOperationException("Unexpected Vector4Array type: " + value);
                 }
+*/
             case Vector4:
                 // can be either ColorRGBA, Vector4f or Quaternion
                 if (value instanceof Vector4f) {
diff --git a/engine/src/core/com/jme3/shader/VarType.java b/engine/src/core/com/jme3/shader/VarType.java
index 80ab243bb..723bc9334 100644
--- a/engine/src/core/com/jme3/shader/VarType.java
+++ b/engine/src/core/com/jme3/shader/VarType.java
@@ -54,9 +54,7 @@ public enum VarType {
 
     TextureBuffer(false,true),
     Texture2D(false,true),
-    Texture2DArray(false,true),
     Texture3D(false,true),
-    Texture3DArray(false,true),
     TextureArray(false,true),
     TextureCubeMap(false,true),
     Int;
diff --git a/engine/src/lwjgl-ogl/com/jme3/renderer/lwjgl/LwjglRenderer.java b/engine/src/lwjgl-ogl/com/jme3/renderer/lwjgl/LwjglRenderer.java
index 594352db9..fa7ef3ed3 100644
--- a/engine/src/lwjgl-ogl/com/jme3/renderer/lwjgl/LwjglRenderer.java
+++ b/engine/src/lwjgl-ogl/com/jme3/renderer/lwjgl/LwjglRenderer.java
@@ -792,7 +792,7 @@ public class LwjglRenderer implements Renderer {
         if (loc < 0) {
             uniform.setLocation(-1);
             // uniform is not declared in shader
-            logger.log(Level.INFO, "Uniform {0} is not declared in shader {1}.", new Object[]{uniform.getName(), shader.getSources()});
+            logger.log(Level.INFO, "Uniform {0} is not declared in shader.", uniform.getName());
         } else {
             uniform.setLocation(loc);
         }