sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hack fix for blenderloader.

Browse Source 
The optimisation disabled would result in null TextureKeys.
-> This would then result in textures being embedded into the j3o file, seriously bloating the assets.

Signed-off-by: Kai Börnert <kai-boernert@visiongamestudios.de>
This commit is contained in:
Kai Börnert 2015-04-07 01:26:13 +02:00
parent 5b56f1e513
commit 9f32bcf7bb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/TextureHelper.java
View File

@ -232,7 +232,7 @@ public class TextureHelper extends AbstractBlenderHelper {
LOGGER.log(Level.FINE, "Fetching texture with OMA = {0}", imageStructure.getOldMemoryAddress()); LOGGER.log(Level.FINE, "Fetching texture with OMA = {0}", imageStructure.getOldMemoryAddress());
Texture result = null; Texture result = null;
Image im = (Image) blenderContext.getLoadedFeature(imageStructure.getOldMemoryAddress(), LoadedDataType.FEATURE); 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())) { if ("ID".equals(imageStructure.getType())) {
LOGGER.fine("Loading texture from external blend file."); LOGGER.fine("Loading texture from external blend file.");
result = (Texture) this.loadLibrary(imageStructure); 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)); result = new Texture2D(new ImageLoader().loadImage(blenderContext.getInputStream(), dataFileBlock.getBlockPosition(), true));
} }
} }
} else { //} else {
result = new Texture2D(im); // result = new Texture2D(im);
} // }
if (result != null) {// render result is not being loaded if (result != null) {// render result is not being loaded
blenderContext.addLoadedFeatures(imageStructure.getOldMemoryAddress(), LoadedDataType.STRUCTURE, imageStructure); blenderContext.addLoadedFeatures(imageStructure.getOldMemoryAddress(), LoadedDataType.STRUCTURE, imageStructure);