Merge pull request #507 from jjYBdx4IL/master

fixes issue https://github.com/jMonkeyEngine/jmonkeyengine/issues/506…
This commit is contained in:
empirephoenix 2016-06-11 17:16:10 +02:00 committed by GitHub
commit 65164e2075

View File

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