diff --git a/sdk/jme3-ogrexml/src/com/jme3/gde/ogrexml/OgreSceneDataObject.java b/sdk/jme3-ogrexml/src/com/jme3/gde/ogrexml/OgreSceneDataObject.java index 05c3465b9..edaf3a2f6 100644 --- a/sdk/jme3-ogrexml/src/com/jme3/gde/ogrexml/OgreSceneDataObject.java +++ b/sdk/jme3-ogrexml/src/com/jme3/gde/ogrexml/OgreSceneDataObject.java @@ -61,17 +61,15 @@ public class OgreSceneDataObject extends SpatialAssetDataObject { return null; } String name = getPrimaryFile().getName(); - FileObject sourceMatFile = getPrimaryFile().getParent().getFileObject(name, "material"); - if (sourceMatFile != null && sourceMatFile.isValid()) { - try { - sourceMatFile.copy(sourceMatFile.getParent(), "+" + sourceMatFile.getName(), sourceMatFile.getExt()); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } - } else { + String matName = null;//((OgreSceneKey)getAssetKey()).getMaterialName(); + if(matName == null){ + matName = name; + } + FileObject sourceMatFile = getPrimaryFile().getParent().getFileObject(matName, "material"); + if (sourceMatFile == null || !sourceMatFile.isValid()) { Confirmation msg = new NotifyDescriptor.Confirmation( "No material file found for " + getPrimaryFile().getNameExt() + "\n" - + "A file named " + name + ".material should be in the same folder.\n" + + "A file named " + matName + ".material should be in the same folder.\n" + "Press OK to import mesh only.", NotifyDescriptor.OK_CANCEL_OPTION, NotifyDescriptor.WARNING_MESSAGE); diff --git a/sdk/jme3-ogrexml/src/com/jme3/gde/ogrexml/OgreXMLDataObject.java b/sdk/jme3-ogrexml/src/com/jme3/gde/ogrexml/OgreXMLDataObject.java index 6720fa96d..a089c66d3 100644 --- a/sdk/jme3-ogrexml/src/com/jme3/gde/ogrexml/OgreXMLDataObject.java +++ b/sdk/jme3-ogrexml/src/com/jme3/gde/ogrexml/OgreXMLDataObject.java @@ -85,11 +85,15 @@ public class OgreXMLDataObject extends SpatialAssetDataObject { if(idx!=-1){ name = name.substring(0, idx); } - FileObject sourceMatFile = getPrimaryFile().getParent().getFileObject(name, "material"); + String matName = ((OgreMeshKey)getAssetKey()).getMaterialName(); + if(matName == null){ + matName = name; + } + FileObject sourceMatFile = getPrimaryFile().getParent().getFileObject(matName, "material"); if (sourceMatFile == null || !sourceMatFile.isValid()) { Confirmation msg = new NotifyDescriptor.Confirmation( "No material file found for " + getPrimaryFile().getNameExt() + "\n" - + "A file named " + name + ".material should be in the same folder.\n" + + "A file named " + matName + ".material should be in the same folder.\n" + "Press OK to import mesh only.", NotifyDescriptor.OK_CANCEL_OPTION, NotifyDescriptor.WARNING_MESSAGE);