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

Fixed isEqual to equals in GeometryBatchFactory and in TestMaterialCompare

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9291 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2012-04-11 22:30:29 +00:00
parent d50efde277
commit 91ea95328e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/test/jme3test/material/TestMaterialCompare.java
View File

@ -86,7 +86,7 @@ public class TestMaterialCompare extends SimpleApplication {
} }
private void testMats(Material mat1, Material mat2, boolean expected) { private void testMats(Material mat1, Material mat2, boolean expected) {
if (mat2.isEqual(mat1)) { if (mat2.equals(mat1)) {
System.out.print(mat1.getName() + " equals " + mat2.getName()); System.out.print(mat1.getName() + " equals " + mat2.getName());
if(expected){ if(expected){
System.out.println(" success"); System.out.println(" success");

2
engine/src/tools/jme3tools/optimize/GeometryBatchFactory.java
View File

@ -291,7 +291,7 @@ public class GeometryBatchFactory {
if (outList == null) { if (outList == null) {
//trying to compare materials with the isEqual method //trying to compare materials with the isEqual method
for (Material mat : matToGeom.keySet()) { for (Material mat : matToGeom.keySet()) {
if (geom.getMaterial().isEqual(mat)) { if (geom.getMaterial().equals(mat)) {
outList = matToGeom.get(mat); outList = matToGeom.get(mat);
} }
} }