diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-27 22:14:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 22:14:50 +0100 |
| commit | fcfffd729789cd80aa77056ca089697b52297d04 (patch) | |
| tree | fc1bb58e900436c48c03c52106eb57250442ae35 /modules/bullet/collision_object_bullet.cpp | |
| parent | 307b1b3a5835ecdb477859785c673a07e248f904 (diff) | |
| parent | a6f3bc7c696af03e3875f78e098d2476e409d15e (diff) | |
Merge pull request #37361 from reduz/server-renames
Renaming of servers for coherency.
Diffstat (limited to 'modules/bullet/collision_object_bullet.cpp')
| -rw-r--r-- | modules/bullet/collision_object_bullet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/bullet/collision_object_bullet.cpp b/modules/bullet/collision_object_bullet.cpp index 5b7e7281e4..0ce57811d7 100644 --- a/modules/bullet/collision_object_bullet.cpp +++ b/modules/bullet/collision_object_bullet.cpp @@ -60,7 +60,7 @@ void CollisionObjectBullet::ShapeWrapper::set_transform(const btTransform &p_tra } btTransform CollisionObjectBullet::ShapeWrapper::get_adjusted_transform() const { - if (shape->get_type() == PhysicsServer::SHAPE_HEIGHTMAP) { + if (shape->get_type() == PhysicsServer3D::SHAPE_HEIGHTMAP) { const HeightMapShapeBullet *hm_shape = (const HeightMapShapeBullet *)shape; // should be safe to cast now btTransform adjusted_transform; |