Merge branch 'master' of github:jMonkeyEngine/jmonkeyengine

11 years ago · 648477e8c2
parent 0d5ac77d52 46f0f32afa
commit 648477e8c2
1 changed files with 6 additions and 2 deletions
--- a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/utils/MaterialUtils.java
+++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/utils/MaterialUtils.java
@ -53,9 +53,13 @@ public class MaterialUtils {
     * @param line
     * @return
     */
-    public static String trimName(String line) {
+    public static String trimName(String line) {        
+        int idx = line.indexOf("-");
+        if(idx!=-1){             
+             line= line.substring(0, idx);
+        }
        line = trimLine(line);
-        int idx = line.indexOf("(");
+        idx = line.indexOf("(");
        if (idx == -1) {
            idx = line.indexOf(":");
        }