From 397c2acec811221aa8b4534400ff6fec9ec8e6f3 Mon Sep 17 00:00:00 2001
From: "nor..67" <normen667@gmail.com>
Date: Sun, 20 Nov 2011 12:41:49 +0000
Subject: [PATCH] - fix scaling in terrain compound generation

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8738 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 .../src/bullet/com/jme3/bullet/util/CollisionShapeFactory.java  | 2 +-
 .../src/jbullet/com/jme3/bullet/util/CollisionShapeFactory.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engine/src/bullet/com/jme3/bullet/util/CollisionShapeFactory.java b/engine/src/bullet/com/jme3/bullet/util/CollisionShapeFactory.java
index b56a355bf..76b7ef12c 100644
--- a/engine/src/bullet/com/jme3/bullet/util/CollisionShapeFactory.java
+++ b/engine/src/bullet/com/jme3/bullet/util/CollisionShapeFactory.java
@@ -96,7 +96,7 @@ public class CollisionShapeFactory {
                 }
                 TerrainQuad terrain = (TerrainQuad) spatial;
                 Transform trans = getTransform(spatial, realRootNode);
-                shape.addChildShape(new HeightfieldCollisionShape(terrain.getHeightMap(), terrain.getLocalScale()),
+                shape.addChildShape(new HeightfieldCollisionShape(terrain.getHeightMap(), trans.getScale()),
                         trans.getTranslation(),
                         trans.getRotation().toRotationMatrix());
             } else if (spatial instanceof Node) {
diff --git a/engine/src/jbullet/com/jme3/bullet/util/CollisionShapeFactory.java b/engine/src/jbullet/com/jme3/bullet/util/CollisionShapeFactory.java
index b56a355bf..76b7ef12c 100644
--- a/engine/src/jbullet/com/jme3/bullet/util/CollisionShapeFactory.java
+++ b/engine/src/jbullet/com/jme3/bullet/util/CollisionShapeFactory.java
@@ -96,7 +96,7 @@ public class CollisionShapeFactory {
                 }
                 TerrainQuad terrain = (TerrainQuad) spatial;
                 Transform trans = getTransform(spatial, realRootNode);
-                shape.addChildShape(new HeightfieldCollisionShape(terrain.getHeightMap(), terrain.getLocalScale()),
+                shape.addChildShape(new HeightfieldCollisionShape(terrain.getHeightMap(), trans.getScale()),
                         trans.getTranslation(),
                         trans.getRotation().toRotationMatrix());
             } else if (spatial instanceof Node) {