Просмотр исходного кода

SDK:
- improve Model Importer deletion file check

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10181 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

nor..67 12 лет назад
Родитель
Сommit
d4bfd0dc0a

+ 7 - 7
jme3-model-importer/src/com/jme3/gde/modelimporter/ImportModel.java

@@ -143,14 +143,14 @@ public final class ImportModel implements ActionListener {
                 if (fileObj != null) {
                     DataObject obj = DataObject.find(fileObj);
                     AssetData data = obj.getLookup().lookup(AssetData.class);
-                    if (data != null) {
+                    if (obj instanceof SpatialAssetDataObject) {
+                        // Delete models that are not J3O.
+                        if (!(obj instanceof BinaryModelDataObject)) {
+                            deleteList.add(fileObj);
+                        }
+                    } else if (data != null) {
                         AssetKey assetKey = data.getAssetKey();
-                        if (obj instanceof SpatialAssetDataObject) {
-                            // Delete models that are not J3O.
-                            if (!(obj instanceof BinaryModelDataObject)) {
-                                deleteList.add(fileObj);
-                            }
-                        } else if (!(assetKey instanceof TextureKey)
+                        if (!(assetKey instanceof TextureKey)
                                 && !(assetKey instanceof MaterialKey)) {
                             // Also delete anything thats not an image or J3M file.
                             deleteList.add(fileObj);