From 9f32bcf7bb116afcfcc8bcacd3bdfbdc18fb2bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Tue, 7 Apr 2015 01:26:13 +0200 Subject: [PATCH] Hack fix for blenderloader. The optimisation disabled would result in null TextureKeys. -> This would then result in textures being embedded into the j3o file, seriously bloating the assets. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kai Börnert --- .../scene/plugins/blender/textures/TextureHelper.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/TextureHelper.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/TextureHelper.java index f6ed89ce7..f1c1c64fc 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/TextureHelper.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/TextureHelper.java @@ -232,7 +232,7 @@ public class TextureHelper extends AbstractBlenderHelper { LOGGER.log(Level.FINE, "Fetching texture with OMA = {0}", imageStructure.getOldMemoryAddress()); Texture result = null; Image im = (Image) blenderContext.getLoadedFeature(imageStructure.getOldMemoryAddress(), LoadedDataType.FEATURE); - if (im == null) { + // if (im == null) { HACK force reaload always, as constructor in else case is destroying the TextureKeys! if ("ID".equals(imageStructure.getType())) { LOGGER.fine("Loading texture from external blend file."); result = (Texture) this.loadLibrary(imageStructure); @@ -253,9 +253,9 @@ public class TextureHelper extends AbstractBlenderHelper { result = new Texture2D(new ImageLoader().loadImage(blenderContext.getInputStream(), dataFileBlock.getBlockPosition(), true)); } } - } else { - result = new Texture2D(im); - } + //} else { + // result = new Texture2D(im); + // } if (result != null) {// render result is not being loaded blenderContext.addLoadedFeatures(imageStructure.getOldMemoryAddress(), LoadedDataType.STRUCTURE, imageStructure);