Browse Source

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

nor..67 13 years ago
parent
commit
7f2202a422
1 changed files with 13 additions and 13 deletions
  1. 13 13
      jme3-ogrexml/src/com/jme3/gde/ogrexml/OgreSceneDataObject.java

+ 13 - 13
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 {