Merge pull request #507 from jjYBdx4IL/master

fixes issue https://github.com/jMonkeyEngine/jmonkeyengine/issues/506
define_list_fix
empirephoenix 9 years ago committed by GitHub
commit 65164e2075
  1. 4
      jme3-core/src/main/java/com/jme3/material/Material.java

@ -992,8 +992,8 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable {
@Override @Override
public String toString() { public String toString() {
return "Material[name=" + name + return "Material[name=" + name +
", def=" + def.getName() + ", def=" + (def != null ? def.getName() : null) +
", tech=" + technique.getDef().getName() + ", tech=" + (technique != null && technique.getDef() != null ? technique.getDef().getName() : null) +
"]"; "]";
} }

Loading…
Cancel
Save