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

Merge pull request #366 from MeFisto94/Issue46

Browse Source 
Fixed Issue #46 : The MaterialViewer will now simply ignore not available textures instead of crashing
This commit is contained in:
Kirill Vainer 2015-10-09 21:28:14 -04:00
commit 9f130a9cb3
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanel.java
View File

@ -10,15 +10,19 @@
*/ */
package com.jme3.gde.materials.multiview.widgets; package com.jme3.gde.materials.multiview.widgets;
import com.jme3.asset.AssetNotFoundException;
import com.jme3.gde.core.assets.ProjectAssetManager; import com.jme3.gde.core.assets.ProjectAssetManager;
import com.jme3.gde.core.properties.TexturePropertyEditor; import com.jme3.gde.core.properties.TexturePropertyEditor;
import com.jme3.gde.core.properties.preview.DDSPreview; import com.jme3.gde.core.properties.preview.DDSPreview;
import com.jme3.gde.materials.MaterialProperty; import com.jme3.gde.materials.MaterialProperty;
import com.jme3.gde.materials.multiview.MaterialEditorTopComponent;
import com.jme3.texture.Texture; import com.jme3.texture.Texture;
import java.awt.Component; import java.awt.Component;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.Icon; import javax.swing.Icon;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import jme3tools.converters.ImageToAwt; import jme3tools.converters.ImageToAwt;
@ -50,7 +54,7 @@ public class TexturePanel extends MaterialPropertyWidget {
exec.execute(new Runnable() { exec.execute(new Runnable() {
public void run() { public void run() {
try{
Texture tex = manager.loadTexture(textureName); Texture tex = manager.loadTexture(textureName);
if (textureName.toLowerCase().endsWith(".dds")) { if (textureName.toLowerCase().endsWith(".dds")) {
if (ddsPreview == null) { if (ddsPreview == null) {
@ -65,6 +69,9 @@ public class TexturePanel extends MaterialPropertyWidget {
} }
}); });
} }
} catch (AssetNotFoundException a) {
Logger.getLogger(MaterialEditorTopComponent.class.getName()).log(Level.WARNING, "Could not load texture {0}", textureName);
}
} }
}); });
} }