sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #507 from jjYBdx4IL/master

Browse Source 
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
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jme3-core/src/main/java/com/jme3/material/Material.java
View File

@ -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) +
"]"; "]";
} }