diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-04 15:26:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 15:26:23 +0100 |
| commit | f8b58784bc693114ffe9c6b523ae73ecb3472311 (patch) | |
| tree | 3e0af68946c765a3b354b09ebb2f312afdac3aad /modules/bullet/collision_object_bullet.h | |
| parent | c4c1ca9cb140f41d718b6456b84900b12ab44b25 (diff) | |
| parent | f4b96cc0a97f1f9edd127920ff5995a75c2e6624 (diff) | |
| download | redot-engine-f8b58784bc693114ffe9c6b523ae73ecb3472311.tar.gz | |
Merge pull request #13257 from AndreaCatania/master
Fixed kinematic movement stuck, Changed how shape scale works.
Diffstat (limited to 'modules/bullet/collision_object_bullet.h')
| -rw-r--r-- | modules/bullet/collision_object_bullet.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/bullet/collision_object_bullet.h b/modules/bullet/collision_object_bullet.h index 4168133e0d..6a3fbe65ff 100644 --- a/modules/bullet/collision_object_bullet.h +++ b/modules/bullet/collision_object_bullet.h @@ -115,6 +115,7 @@ protected: bool ray_pickable; btCollisionObject *bt_collision_object; Vector3 body_scale; + bool force_shape_reset; SpaceBullet *space; VSet<RID> exceptions; |