From 2a18784041b50dfce0db6f3930ed7d4c506b1a3a Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Wed, 11 Jul 2012 15:54:17 +0000 Subject: [PATCH] SDK: - remove material file check from the ogre scene data object git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9560 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../jme3/gde/ogrexml/OgreSceneDataObject.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) 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 edaf3a2f6..eef5ee409 100644 --- a/sdk/jme3-ogrexml/src/com/jme3/gde/ogrexml/OgreSceneDataObject.java +++ b/sdk/jme3-ogrexml/src/com/jme3/gde/ogrexml/OgreSceneDataObject.java @@ -65,19 +65,19 @@ public class OgreSceneDataObject extends SpatialAssetDataObject { 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 " + matName + ".material should be in the same folder.\n" - + "Press OK to import mesh only.", - NotifyDescriptor.OK_CANCEL_OPTION, - NotifyDescriptor.WARNING_MESSAGE); - Object result = DialogDisplayer.getDefault().notify(msg); - if (!NotifyDescriptor.OK_OPTION.equals(result)) { - return null; - } - } +// 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 " + matName + ".material should be in the same folder.\n" +// + "Press OK to import mesh only.", +// NotifyDescriptor.OK_CANCEL_OPTION, +// NotifyDescriptor.WARNING_MESSAGE); +// Object result = DialogDisplayer.getDefault().notify(msg); +// if (!NotifyDescriptor.OK_OPTION.equals(result)) { +// return null; +// } +// } FileLock lock = null; try {