Browse Source

Re fixed material contentEquals crash when technique is null...but better

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9459 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
rem..om 13 years ago
parent
commit
855676173a
1 changed files with 2 additions and 2 deletions
  1. 2 2
      engine/src/core/com/jme3/material/Material.java

+ 2 - 2
engine/src/core/com/jme3/material/Material.java

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