Browse Source

- another fix in deserialization of TerrainGrid

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8685 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
nor..67 14 years ago
parent
commit
6c3f896604
1 changed files with 7 additions and 5 deletions
  1. 7 5
      engine/src/terrain/com/jme3/terrain/geomipmap/TerrainGrid.java

+ 7 - 5
engine/src/terrain/com/jme3/terrain/geomipmap/TerrainGrid.java

@@ -237,8 +237,8 @@ public class TerrainGrid extends TerrainQuad {
 
     public TerrainGrid() {
     }
-    
-    private void initData(){
+
+    private void initData() {
         int maxVisibleSize = size;
         this.quarterSize = maxVisibleSize >> 2;
         this.quadSize = (maxVisibleSize + 1) >> 1;
@@ -452,9 +452,11 @@ public class TerrainGrid extends TerrainQuad {
         offsetAmount = c.readFloat("offsetAmount", 0);
         terrainQuadGrid = (TerrainQuadGrid) c.readSavable("terrainQuadGrid", null);
         initData();
-        terrainQuadGrid.setSize(this.size);
-        terrainQuadGrid.setPatchSize(this.patchSize);
-        terrainQuadGrid.setQuadSize(this.quadSize);
+        if (terrainQuadGrid != null) {
+            terrainQuadGrid.setSize(this.size);
+            terrainQuadGrid.setPatchSize(this.patchSize);
+            terrainQuadGrid.setQuadSize(this.quadSize);
+        }
     }
 
     @Override