summaryrefslogtreecommitdiffstats
path: root/modules/bullet
diff options
context:
space:
mode:
authorAndrea Catania <info@andreacatania.com>2020-08-05 13:54:25 +0200
committerGitHub <noreply@github.com>2020-08-05 13:54:25 +0200
commit6831da630f5609e1b659d65425d9da07e25df616 (patch)
treed5eccc1b28271aef4794ce4fdf884e4a36f45813 /modules/bullet
parent8de57bde13cf48c6d5c54c717ab5c7b973915939 (diff)
parent3a05ca9c2bdd90e04697dc17649f838c9d1f62b9 (diff)
downloadredot-engine-6831da630f5609e1b659d65425d9da07e25df616.tar.gz
Merge pull request #40989 from madmiraal/fix-40739
Reload Bullet space override modifier even when RigidBody is inactive.
Diffstat (limited to 'modules/bullet')
-rw-r--r--modules/bullet/rigid_body_bullet.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/bullet/rigid_body_bullet.cpp b/modules/bullet/rigid_body_bullet.cpp
index 5c1144b875..32c3240a35 100644
--- a/modules/bullet/rigid_body_bullet.cpp
+++ b/modules/bullet/rigid_body_bullet.cpp
@@ -897,8 +897,7 @@ void RigidBodyBullet::on_exit_area(AreaBullet *p_area) {
}
void RigidBodyBullet::reload_space_override_modificator() {
- // Make sure that kinematic bodies have their total gravity calculated
- if (!is_active() && PhysicsServer3D::BODY_MODE_KINEMATIC != mode) {
+ if (mode == PhysicsServer3D::BODY_MODE_STATIC) {
return;
}