From dada1c1d3889cd1579a11eebd270d6935b098c9f Mon Sep 17 00:00:00 2001 From: "rem..om" Date: Mon, 14 Jan 2013 22:28:59 +0000 Subject: [PATCH] CollisionShapeFactory.createCompoundShape now exclude geometies the are batched in a BatchNode. git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10070 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../com/jme3/bullet/util/CollisionShapeFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/src/bullet-common/com/jme3/bullet/util/CollisionShapeFactory.java b/engine/src/bullet-common/com/jme3/bullet/util/CollisionShapeFactory.java index 38551ea3f..3f38e0e50 100644 --- a/engine/src/bullet-common/com/jme3/bullet/util/CollisionShapeFactory.java +++ b/engine/src/bullet-common/com/jme3/bullet/util/CollisionShapeFactory.java @@ -102,7 +102,7 @@ public class CollisionShapeFactory { shape.addChildShape(new HeightfieldCollisionShape(terrain.getHeightMap(), terrain.getLocalScale()), trans.getTranslation(), trans.getRotation().toRotationMatrix()); - } else if (spatial instanceof Geometry) { + } else if (spatial instanceof Geometry && !((Geometry)spatial).isBatched()) { Boolean bool = spatial.getUserData(UserData.JME_PHYSICSIGNORE); if (bool != null && bool.booleanValue()) { continue; // go to the next child in the loop