diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-16 09:32:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-16 09:32:48 +0100 |
| commit | d7176e9040c6db885dace95a942bcc2c6889e15b (patch) | |
| tree | d507da5845af1ae01c1c6025e182d2346dbf811c /modules/bullet | |
| parent | 670b843ec7bc6fd6ef8204b9736e126f47d198e3 (diff) | |
| parent | 41209efa7f790aba5e7cfe6d8d03d1e091f58087 (diff) | |
Merge pull request #42167 from madmiraal/fix-42108
Remove the unnecessary sync() and the restrictions it imposes on 3D Physics.
Diffstat (limited to 'modules/bullet')
| -rw-r--r-- | modules/bullet/bullet_physics_server.cpp | 3 | ||||
| -rw-r--r-- | modules/bullet/bullet_physics_server.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/modules/bullet/bullet_physics_server.cpp b/modules/bullet/bullet_physics_server.cpp index f7290666ad..663ad6e3e1 100644 --- a/modules/bullet/bullet_physics_server.cpp +++ b/modules/bullet/bullet_physics_server.cpp @@ -1553,9 +1553,6 @@ void BulletPhysicsServer3D::step(float p_deltaTime) { } } -void BulletPhysicsServer3D::sync() { -} - void BulletPhysicsServer3D::flush_queries() { if (!active) { return; diff --git a/modules/bullet/bullet_physics_server.h b/modules/bullet/bullet_physics_server.h index 02ba5458d8..dca9339c44 100644 --- a/modules/bullet/bullet_physics_server.h +++ b/modules/bullet/bullet_physics_server.h @@ -397,7 +397,6 @@ public: virtual void init() override; virtual void step(float p_deltaTime) override; - virtual void sync() override; virtual void flush_queries() override; virtual void finish() override; |