diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-09 13:01:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-09 13:01:41 +0100 |
| commit | 25b36f18d38c222fb8d115a40ef1de07445e6bf8 (patch) | |
| tree | 9c1795e49d29e9f6ff1c1490ac32aaffd608b17c /modules/bullet/bullet_physics_server.h | |
| parent | 3fd1c0c76b61173c5d611b14b5b137fb61654f08 (diff) | |
| parent | bd5df841990e7410593d8aae5bee10bab16f6f43 (diff) | |
Merge pull request #12756 from Stratos695/master
Allowing double-axis lock in RigidBody & KinematicBody (Fixes #12500)
Diffstat (limited to 'modules/bullet/bullet_physics_server.h')
| -rw-r--r-- | modules/bullet/bullet_physics_server.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/bullet/bullet_physics_server.h b/modules/bullet/bullet_physics_server.h index ad8137ee2f..ed5acb9041 100644 --- a/modules/bullet/bullet_physics_server.h +++ b/modules/bullet/bullet_physics_server.h @@ -226,8 +226,8 @@ public: virtual void body_apply_torque_impulse(RID p_body, const Vector3 &p_impulse); virtual void body_set_axis_velocity(RID p_body, const Vector3 &p_axis_velocity); - virtual void body_set_axis_lock(RID p_body, BodyAxisLock p_lock); - virtual BodyAxisLock body_get_axis_lock(RID p_body) const; + virtual void body_set_axis_lock(RID p_body, int axis, bool p_lock); + virtual bool body_get_axis_lock(RID p_body) const; virtual void body_add_collision_exception(RID p_body, RID p_body_b); virtual void body_remove_collision_exception(RID p_body, RID p_body_b); |