summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-04-05 11:52:22 +0200
committerGitHub <noreply@github.com>2019-04-05 11:52:22 +0200
commit6a33727cb1ae9fe73432912ca07b583cd523a00f (patch)
treeb6358318d7678eb132f98853a1e86e0967f6c3af
parent1ab9b86a2156998bc74452b081978ffedfc8bc7a (diff)
parentcdcdba704b989aa9d7decc40d3181f8378378512 (diff)
Merge pull request #27687 from Zylann/fix_heightmap_shape_min_max
Fix wrong heights data used to compute min and max heights
-rw-r--r--modules/bullet/shape_bullet.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/bullet/shape_bullet.cpp b/modules/bullet/shape_bullet.cpp
index 1aba31f03d..b590d63167 100644
--- a/modules/bullet/shape_bullet.cpp
+++ b/modules/bullet/shape_bullet.cpp
@@ -510,16 +510,17 @@ void HeightMapShapeBullet::set_data(const Variant &p_data) {
// Compute min and max heights if not specified.
if (!d.has("min_height") && !d.has("max_height")) {
- PoolVector<real_t>::Read r = heights.read();
- int heights_size = heights.size();
+ PoolVector<real_t>::Read r = l_heights.read();
+ int heights_size = l_heights.size();
for (int i = 0; i < heights_size; ++i) {
real_t h = r[i];
- if (h < l_min_height)
+ if (h < l_min_height) {
l_min_height = h;
- else if (h > l_max_height)
+ } else if (h > l_max_height) {
l_max_height = h;
+ }
}
}