diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-08-07 15:31:26 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 15:31:26 -0300 |
| commit | 14fd797c536a675c94c36a2b2b924ce0295f5d64 (patch) | |
| tree | 9ac70ce41c656f726402187f0fd90e578036c3af /modules/bullet/bullet_physics_server.cpp | |
| parent | e0456f7976832b9f17958e1e8e7c18379b19e382 (diff) | |
| parent | 5e65e28eed1398cceb4b77cb99ba6578115953db (diff) | |
| download | redot-engine-14fd797c536a675c94c36a2b2b924ce0295f5d64.tar.gz | |
Merge pull request #20381 from AndreaCatania/phymat_2
Improved Physics material
Diffstat (limited to 'modules/bullet/bullet_physics_server.cpp')
| -rw-r--r-- | modules/bullet/bullet_physics_server.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/modules/bullet/bullet_physics_server.cpp b/modules/bullet/bullet_physics_server.cpp index 9263a9ba6d..0857635492 100644 --- a/modules/bullet/bullet_physics_server.cpp +++ b/modules/bullet/bullet_physics_server.cpp @@ -644,20 +644,6 @@ float BulletPhysicsServer::body_get_param(RID p_body, BodyParameter p_param) con return body->get_param(p_param); } -void BulletPhysicsServer::body_set_combine_mode(RID p_body, BodyParameter p_param, CombineMode p_mode) { - RigidBodyBullet *body = rigid_body_owner.get(p_body); - ERR_FAIL_COND(!body); - - body->set_combine_mode(p_param, p_mode); -} - -PhysicsServer::CombineMode BulletPhysicsServer::body_get_combine_mode(RID p_body, BodyParameter p_param) const { - RigidBodyBullet *body = rigid_body_owner.get(p_body); - ERR_FAIL_COND_V(!body, COMBINE_MODE_INHERIT); - - return body->get_combine_mode(p_param); -} - void BulletPhysicsServer::body_set_kinematic_safe_margin(RID p_body, real_t p_margin) { RigidBodyBullet *body = rigid_body_owner.get(p_body); ERR_FAIL_COND(!body); |