* Fix crash on context.restart(). Reset shader sources when shader itself is reset

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@8166 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

diff --git a/engine/src/core/com/jme3/shader/Shader.java b/engine/src/core/com/jme3/shader/Shader.java
index db64a05..e86eb42 100644 (file)
--- a/engine/src/core/com/jme3/shader/Shader.java
+++ b/engine/src/core/com/jme3/shader/Shader.java
@@ -206,11 +206,11 @@ public final class Shader extends GLObject implements Savable {
         }\r
 \r
         public void deleteObject(Renderer r){\r
-            r.deleteShaderSource(this);\r
+            r.deleteShaderSource(ShaderSource.this);\r
         }\r
 \r
         public GLObject createDestructableClone(){\r
-            return new ShaderSource(this);\r
+            return new ShaderSource(ShaderSource.this);\r
         }\r
     }\r
 \r
@@ -427,9 +427,12 @@ public final class Shader extends GLObject implements Savable {
     public void resetObject() {\r
         this.id = -1;\r
         this.usable = false;\r
+        \r
+        for (ShaderSource source : shaderList){\r
+            source.resetObject();\r
+        }\r
+        \r
         setUpdateNeeded();\r
-        // Already done by the call above\r
-        //resetLocations();\r
     }\r
 \r
     @Override\r