From 91ea95328e518c94e995c84be2c8afb6b776debe Mon Sep 17 00:00:00 2001 From: "rem..om" Date: Wed, 11 Apr 2012 22:30:29 +0000 Subject: [PATCH] Fixed isEqual to equals in GeometryBatchFactory and in TestMaterialCompare git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9291 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/src/test/jme3test/material/TestMaterialCompare.java | 2 +- engine/src/tools/jme3tools/optimize/GeometryBatchFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/src/test/jme3test/material/TestMaterialCompare.java b/engine/src/test/jme3test/material/TestMaterialCompare.java index 57b33cbe2..a2a73abb3 100644 --- a/engine/src/test/jme3test/material/TestMaterialCompare.java +++ b/engine/src/test/jme3test/material/TestMaterialCompare.java @@ -86,7 +86,7 @@ public class TestMaterialCompare extends SimpleApplication { } 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()); if(expected){ System.out.println(" success"); diff --git a/engine/src/tools/jme3tools/optimize/GeometryBatchFactory.java b/engine/src/tools/jme3tools/optimize/GeometryBatchFactory.java index 067427bc5..dff58df9e 100644 --- a/engine/src/tools/jme3tools/optimize/GeometryBatchFactory.java +++ b/engine/src/tools/jme3tools/optimize/GeometryBatchFactory.java @@ -291,7 +291,7 @@ public class GeometryBatchFactory { if (outList == null) { //trying to compare materials with the isEqual method for (Material mat : matToGeom.keySet()) { - if (geom.getMaterial().isEqual(mat)) { + if (geom.getMaterial().equals(mat)) { outList = matToGeom.get(mat); } }