From 8e1bedf7e71a9ceae7f36367145ee66bfe4f8f1f Mon Sep 17 00:00:00 2001 From: "Kae..pl" Date: Fri, 8 Nov 2013 08:40:25 +0000 Subject: [PATCH] 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 --- .../jme3/scene/plugins/blender/textures/CombinedTexture.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/CombinedTexture.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/CombinedTexture.java index 02da754eb..37a650255 100644 --- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/CombinedTexture.java +++ b/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); } } }