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

* Fixed NullPointerException when loading old materials that used wireframe.j3md

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7865 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Sha..om 2011-07-16 17:14:47 +00:00
parent 7d08828fa7
commit a5d00fd003
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/core/com/jme3/material/Material.java
View File

@ -1031,7 +1031,7 @@ public class Material implements Cloneable, Savable, Comparable<Material> {
defName = "Common/MatDefs/Misc/Unshaded.j3md"; defName = "Common/MatDefs/Misc/Unshaded.j3md";
}else if (defName.equalsIgnoreCase("Common/MatDefs/Misc/WireColor.j3md")){ }else if (defName.equalsIgnoreCase("Common/MatDefs/Misc/WireColor.j3md")){
// Using WireColor, set wireframe renderstate = true and use Unshaded // Using WireColor, set wireframe renderstate = true and use Unshaded
additionalState.setWireframe(true); getAdditionalRenderState().setWireframe(true);
defName = "Common/MatDefs/Misc/Unshaded.j3md"; defName = "Common/MatDefs/Misc/Unshaded.j3md";
}else if (defName.equalsIgnoreCase("Common/MatDefs/Misc/Unshaded.j3md")){ }else if (defName.equalsIgnoreCase("Common/MatDefs/Misc/Unshaded.j3md")){
// Uses unshaded, ensure that the proper param is set // Uses unshaded, ensure that the proper param is set