diff --git a/engine/src/ogre/com/jme3/scene/plugins/ogre/SceneLoader.java b/engine/src/ogre/com/jme3/scene/plugins/ogre/SceneLoader.java index 119c26d4b..72c56a6f8 100644 --- a/engine/src/ogre/com/jme3/scene/plugins/ogre/SceneLoader.java +++ b/engine/src/ogre/com/jme3/scene/plugins/ogre/SceneLoader.java @@ -37,6 +37,7 @@ import com.jme3.asset.AssetInfo; import com.jme3.asset.AssetKey; import com.jme3.asset.AssetLoader; import com.jme3.asset.AssetManager; +import com.jme3.asset.AssetNotFoundException; import com.jme3.light.DirectionalLight; import com.jme3.light.Light; import com.jme3.light.PointLight; @@ -206,9 +207,13 @@ public class SceneLoader extends DefaultHandler implements AssetLoader { assert elementStack.peek().equals("externals"); }else if (qName.equals("file")){ assert elementStack.peek().equals("item"); - materialList = (MaterialList) - assetManager.loadAsset(folderName+attribs.getValue("name")); - + String matFile = folderName+attribs.getValue("name"); + try { + materialList = (MaterialList) assetManager.loadAsset(matFile); + } catch (AssetNotFoundException ex){ + materialList = null; + logger.log(Level.WARNING, "Cannot locate material file: {0}", matFile); + } }else if (qName.equals("node")){ String curElement = elementStack.peek(); assert curElement.equals("nodes") || curElement.equals("node"); diff --git a/engine/src/test-data/Scenes/ManyLights/AO.jpg b/engine/src/test-data/Scenes/ManyLights/AO.jpg index 97dddc27a..00990785d 100644 Binary files a/engine/src/test-data/Scenes/ManyLights/AO.jpg and b/engine/src/test-data/Scenes/ManyLights/AO.jpg differ diff --git a/engine/src/test-data/Scenes/ManyLights/Main.material b/engine/src/test-data/Scenes/ManyLights/Main.material index c12a65695..6b90874f3 100644 --- a/engine/src/test-data/Scenes/ManyLights/Main.material +++ b/engine/src/test-data/Scenes/ManyLights/Main.material @@ -11,7 +11,7 @@ material Material emissive 0.000000 0.000000 0.000000 1.000000 texture_unit { - texture AO.tga + texture AO.jpg tex_address_mode wrap filtering trilinear }