sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SDK:

Browse Source 
- 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
This commit is contained in:
nor..67 2012-07-11 15:54:17 +00:00
parent 558dc2bcbb
commit 2a18784041
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sdk/jme3-ogrexml/src/com/jme3/gde/ogrexml/OgreSceneDataObject.java
View File

@ -65,19 +65,19 @@ public class OgreSceneDataObject extends SpatialAssetDataObject {
if(matName == null){ if(matName == null){
matName = name; matName = name;
} }
FileObject sourceMatFile = getPrimaryFile().getParent().getFileObject(matName, "material"); // FileObject sourceMatFile = getPrimaryFile().getParent().getFileObject(matName, "material");
if (sourceMatFile == null || !sourceMatFile.isValid()) { // if (sourceMatFile == null || !sourceMatFile.isValid()) {
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 " + matName + ".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.", // + "Press OK to import mesh only.",
NotifyDescriptor.OK_CANCEL_OPTION, // NotifyDescriptor.OK_CANCEL_OPTION,
NotifyDescriptor.WARNING_MESSAGE); // NotifyDescriptor.WARNING_MESSAGE);
Object result = DialogDisplayer.getDefault().notify(msg); // Object result = DialogDisplayer.getDefault().notify(msg);
if (!NotifyDescriptor.OK_OPTION.equals(result)) { // if (!NotifyDescriptor.OK_OPTION.equals(result)) {
return null; // return null;
} // }
} // }
FileLock lock = null; FileLock lock = null;
try { try {