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

Fixed material contentEquals crash when technique is null.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9458 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2012-06-07 21:59:31 +00:00
parent 476120616c
commit 3e35e32b2d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,8 +252,8 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable {
// E.g. if user chose custom technique for one material but
// uses default technique for other material, the materials
// are not equal.
String thisDefName = this.technique != null ? this.technique.getDef().getName() : null;
String otherDefName = other.technique != null ? other.technique.getDef().getName() : null;
String thisDefName = this.technique != null ? this.technique.getDef().getName() : "";
String otherDefName = other.technique != null ? other.technique.getDef().getName() : "";
if (!thisDefName.equals(otherDefName)) {
return false;
}