Bladeren bron

Bugfix: fixed an NPE exception that occured during flat textures merging.

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10878 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
Kae..pl 12 jaren geleden
bovenliggende
commit
8e1bedf7e7
1 gewijzigde bestanden met toevoegingen van 1 en 1 verwijderingen
  1. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/textures/CombinedTexture.java

+ 1 - 1
engine/src/blender/com/jme3/scene/plugins/blender/textures/CombinedTexture.java

@@ -206,7 +206,7 @@ public class CombinedTexture {
                         triangulatedTexture.castToUVS((TriangulatedTexture) resultTexture, blenderContext);
                         // merge triangulated textures
                         for (int i = 0; i < ((TriangulatedTexture) resultTexture).getFaceTextureCount(); ++i) {
-                            ImageUtils.merge(((TriangulatedTexture) resultTexture).getFaceTextureElement(i).image, triangulatedTexture.getImage());
+                            ImageUtils.merge(((TriangulatedTexture) resultTexture).getFaceTextureElement(i).image, triangulatedTexture.getFaceTextureElement(i).image);
                         }
                     }
                 }