diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-07-12 05:09:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-12 05:09:37 +0200 |
| commit | 118d4f311516e678cb2d0a6565e1d8626f5e8815 (patch) | |
| tree | 5b9b1d6b8d57563accc443735fb50a7418c898de /modules/bullet/bullet_physics_server.cpp | |
| parent | 40f38216cf4b50b175bf9c70b35291d900db0f80 (diff) | |
| parent | 0a36e974daeac1875d4e7551f4ba88ba8e1d1851 (diff) | |
Merge pull request #19540 from muiroc/cylinder
Cylinder resource and collision shape (bullet only)
Diffstat (limited to 'modules/bullet/bullet_physics_server.cpp')
| -rw-r--r-- | modules/bullet/bullet_physics_server.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/bullet/bullet_physics_server.cpp b/modules/bullet/bullet_physics_server.cpp index 6246a295ec..54431f93f1 100644 --- a/modules/bullet/bullet_physics_server.cpp +++ b/modules/bullet/bullet_physics_server.cpp @@ -113,6 +113,10 @@ RID BulletPhysicsServer::shape_create(ShapeType p_shape) { shape = bulletnew(CapsuleShapeBullet); } break; + case SHAPE_CYLINDER: { + + shape = bulletnew(CylinderShapeBullet); + } break; case SHAPE_CONVEX_POLYGON: { shape = bulletnew(ConvexPolygonShapeBullet); |