- fix creation of unnecessary +Name.material file on ogre import

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9468 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2012-06-11 00:00:30 +00:00
parent 0da5c9636f
commit 3594e90e66

View File

@ -86,13 +86,7 @@ public class OgreXMLDataObject extends SpatialAssetDataObject {
name = name.substring(0, idx); name = name.substring(0, idx);
} }
FileObject sourceMatFile = getPrimaryFile().getParent().getFileObject(name, "material"); FileObject sourceMatFile = getPrimaryFile().getParent().getFileObject(name, "material");
if (sourceMatFile != null && sourceMatFile.isValid()) { if (sourceMatFile == null || !sourceMatFile.isValid()) {
try {
sourceMatFile.copy(sourceMatFile.getParent(), "+" + sourceMatFile.getName(), sourceMatFile.getExt());
} catch (IOException ex) {
Exceptions.printStackTrace(ex);
}
} else {
Confirmation msg = new NotifyDescriptor.Confirmation( Confirmation msg = new NotifyDescriptor.Confirmation(
"No material file found for " + getPrimaryFile().getNameExt() + "\n" "No material file found for " + getPrimaryFile().getNameExt() + "\n"
+ "A file named " + name + ".material should be in the same folder.\n" + "A file named " + name + ".material should be in the same folder.\n"