Browse Source

OgreXML: Use the placeholder texture for missing textures

shadowislord 10 years ago
parent
commit
85bba59541

+ 2 - 2
jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MaterialLoader.java

@@ -140,7 +140,7 @@ public class MaterialLoader implements AssetLoader {
             textures[texUnit].setImage(loadedTexture.getImage());
             textures[texUnit].setImage(loadedTexture.getImage());
             textures[texUnit].setMinFilter(loadedTexture.getMinFilter());
             textures[texUnit].setMinFilter(loadedTexture.getMinFilter());
             textures[texUnit].setKey(loadedTexture.getKey());
             textures[texUnit].setKey(loadedTexture.getKey());
-
+            
             // XXX: Is this really neccessary?
             // XXX: Is this really neccessary?
             textures[texUnit].setWrap(WrapMode.Repeat);
             textures[texUnit].setWrap(WrapMode.Repeat);
             if (texName != null){
             if (texName != null){
@@ -151,7 +151,7 @@ public class MaterialLoader implements AssetLoader {
             }
             }
         } catch (AssetNotFoundException ex){
         } catch (AssetNotFoundException ex){
             logger.log(Level.WARNING, "Cannot locate {0} for material {1}", new Object[]{texKey, matName});
             logger.log(Level.WARNING, "Cannot locate {0} for material {1}", new Object[]{texKey, matName});
-            textures[texUnit].setImage(PlaceholderAssets.getPlaceholderImage());
+            textures[texUnit].setImage(PlaceholderAssets.getPlaceholderImage(assetManager));
             textures[texUnit].setKey(texKey);
             textures[texUnit].setKey(texKey);
         }
         }
     }
     }

+ 1 - 1
jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/matext/MaterialExtensionLoader.java

@@ -81,7 +81,7 @@ public class MaterialExtensionLoader {
                 tex.setWrap(WrapMode.Repeat);
                 tex.setWrap(WrapMode.Repeat);
             } catch (AssetNotFoundException ex){
             } catch (AssetNotFoundException ex){
                 logger.log(Level.WARNING, "Cannot locate {0} for material {1}", new Object[]{texKey, key});
                 logger.log(Level.WARNING, "Cannot locate {0} for material {1}", new Object[]{texKey, key});
-                tex = new Texture2D( PlaceholderAssets.getPlaceholderImage() );
+                tex = new Texture2D( PlaceholderAssets.getPlaceholderImage(assetManager) );
                 tex.setWrap(WrapMode.Repeat);
                 tex.setWrap(WrapMode.Repeat);
                 tex.setKey(texKey);
                 tex.setKey(texKey);
             }
             }