diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java index 73797cadcc..fc1d66d709 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java @@ -186,7 +186,7 @@ public String getShaderCode(String version, Shader.ShaderType type) { return ""; } catch (Exception e) { Exceptions.printStackTrace(e); - return "error generating shader " + e.getMessage(); + return "Error generating shader: " + e.getMessage(); } } diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/MatDefDataObject.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/MatDefDataObject.java index 634792505c..cae44f72a7 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/MatDefDataObject.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/MatDefDataObject.java @@ -142,6 +142,7 @@ public MatDefDataObject(FileObject pf, MultiFileLoader loader) throws DataObject findAssetManager(); final MatDefMetaData metaData = new MatDefMetaData(this); lookupContents.add(metaData); + lookupContents.add(new MatDefNavigatorPanel()); pf.addFileChangeListener(new FileChangeAdapter() { @Override public void fileChanged(FileEvent fe) { diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialPreviewRenderer.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialPreviewRenderer.java index e400da0f45..fc92aab9c5 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialPreviewRenderer.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialPreviewRenderer.java @@ -148,7 +148,7 @@ public void run() { }); } - private int lastErrorHash = 0; + private static int lastErrorHash = 0; private void smartLog(String expText, String message) { int hash = message.hashCode(); @@ -183,7 +183,8 @@ public Material reloadMaterial(Material mat) { //compilation error, the shader code will be output to the console //the following code will output the error //System.err.println(e.getMessage()); - Logger.getLogger(MaterialDebugAppState.class.getName()).log(Level.SEVERE, e.getMessage()); + //Logger.getLogger(MaterialDebugAppState.class.getName()).log(Level.SEVERE, e.getMessage()); + smartLog("{0}", e.getMessage()); java.awt.EventQueue.invokeLater(new Runnable() { public void run() {