From 70ac82d5daea72c3a2f49b5c9db0cf777ceda9c0 Mon Sep 17 00:00:00 2001 From: "Paul m. p. P" Date: Mon, 31 May 2021 17:43:25 +0200 Subject: [PATCH] bullet: Fix compilation issue with BulletHeightfieldShape Fixes #1161 --- panda/src/bullet/bulletHeightfieldShape.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/panda/src/bullet/bulletHeightfieldShape.cxx b/panda/src/bullet/bulletHeightfieldShape.cxx index 55ed86d16e..739abd580b 100644 --- a/panda/src/bullet/bulletHeightfieldShape.cxx +++ b/panda/src/bullet/bulletHeightfieldShape.cxx @@ -44,7 +44,7 @@ BulletHeightfieldShape(const PNMImage &image, PN_stdfloat max_height, BulletUpAx _shape = new btHeightfieldTerrainShape(_num_rows, _num_cols, - _data, + (const void *)_data, max_height, up, true, false); @@ -102,7 +102,7 @@ BulletHeightfieldShape(Texture *tex, PN_stdfloat max_height, BulletUpAxis up) : _shape = new btHeightfieldTerrainShape(_num_rows, _num_cols, - _data, + (const void *)_data, max_height, up, true, false); @@ -127,7 +127,7 @@ BulletHeightfieldShape(const BulletHeightfieldShape ©) { _shape = new btHeightfieldTerrainShape(_num_rows, _num_cols, - _data, + (const void *)_data, _max_height, _up, true, false); @@ -208,7 +208,7 @@ fillin(DatagramIterator &scan, BamReader *manager) { _shape = new btHeightfieldTerrainShape(_num_rows, _num_cols, - _data, + (const void *)_data, _max_height, _up, true, false);