diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-19 15:39:55 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-19 15:39:55 +0200 |
| commit | 40a7fb238de94bc61acf68b535d9ef36d7ceeedd (patch) | |
| tree | 2370572628f8f33dcbe48786daa4d3164bac4b53 /servers | |
| parent | ec60c4ee9e5d5a4452bf43cba44d4fefa56261da (diff) | |
| parent | 10395f5df2a1cac6ed83e674c084e62a88fcdde9 (diff) | |
Merge pull request #64728 from fabriceci/only-report-recovery-for-floor-snapping
Turn on recovery as collisions only for floor snapping
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/physics_server_2d.h | 2 | ||||
| -rw-r--r-- | servers/physics_server_3d.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/servers/physics_server_2d.h b/servers/physics_server_2d.h index d5b4dc05e6..d9572e6594 100644 --- a/servers/physics_server_2d.h +++ b/servers/physics_server_2d.h @@ -490,7 +490,7 @@ public: bool collide_separation_ray = false; HashSet<RID> exclude_bodies; HashSet<ObjectID> exclude_objects; - bool recovery_as_collision = false; + bool recovery_as_collision = false; // Don't report margin recovery as collision by default, only used for floor snapping. MotionParameters() {} diff --git a/servers/physics_server_3d.h b/servers/physics_server_3d.h index 1308e4cd36..6ad5e26815 100644 --- a/servers/physics_server_3d.h +++ b/servers/physics_server_3d.h @@ -527,7 +527,7 @@ public: bool collide_separation_ray = false; HashSet<RID> exclude_bodies; HashSet<ObjectID> exclude_objects; - bool recovery_as_collision = false; + bool recovery_as_collision = false; // Don't report margin recovery as collision by default, only used for floor snapping. MotionParameters() {} |