From c6a3a78b1e78824ac8ab37b57aafdbb4f18311ff Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Mon, 4 Apr 2011 17:05:27 +0000 Subject: [PATCH] - show correct material j3m in SceneExplorer git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7184 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../nodes/properties/MaterialPropertyEditor.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/properties/MaterialPropertyEditor.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/properties/MaterialPropertyEditor.java index 776fb6c66..cc19bba1e 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/properties/MaterialPropertyEditor.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/properties/MaterialPropertyEditor.java @@ -81,7 +81,11 @@ public class MaterialPropertyEditor implements PropertyEditor { } public String getAsText() { - return material.toString(); + String name = material.getAssetName(); + if (name == null) { + name = "stored in file"; + } + return name; } public void setAsText(final String text) throws IllegalArgumentException { @@ -109,7 +113,9 @@ public class MaterialPropertyEditor implements PropertyEditor { public String[] getTags() { SceneRequest request = SceneApplication.getApplication().getCurrentSceneRequest(); - if(request==null) return new String[]{}; + if (request == null) { + return new String[]{}; + } String[] mats = request.getManager().getMaterials(); return mats; }