diff options
| author | J08nY <johny@neuromancer.sk> | 2018-10-07 22:47:10 +0200 |
|---|---|---|
| committer | J08nY <johny@neuromancer.sk> | 2018-10-08 12:31:28 +0200 |
| commit | 56005772cd2fcbd095f2d14c6d13e83e632d0775 (patch) | |
| tree | 5b0e392840ecc90596720386cf439716c834d03a /modules/bullet | |
| parent | b17e71b6e5e035f49b5b3b5b55b9cdac80215d72 (diff) | |
Fix multi-statement macro call not being covered.
Diffstat (limited to 'modules/bullet')
| -rw-r--r-- | modules/bullet/bullet_utilities.h | 7 | ||||
| -rw-r--r-- | modules/bullet/collision_object_bullet.cpp | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/modules/bullet/bullet_utilities.h b/modules/bullet/bullet_utilities.h index 029eb6691a..553c1d0384 100644 --- a/modules/bullet/bullet_utilities.h +++ b/modules/bullet/bullet_utilities.h @@ -39,7 +39,8 @@ new cl #define bulletdelete(cl) \ - delete cl; \ - cl = NULL; - + { \ + delete cl; \ + cl = NULL; \ + } #endif diff --git a/modules/bullet/collision_object_bullet.cpp b/modules/bullet/collision_object_bullet.cpp index a3944b4f99..402a276f95 100644 --- a/modules/bullet/collision_object_bullet.cpp +++ b/modules/bullet/collision_object_bullet.cpp @@ -310,9 +310,10 @@ void RigidCollisionObjectBullet::shape_changed(int p_shape_index) { void RigidCollisionObjectBullet::reload_shapes() { - if (mainShape && mainShape->isCompound()) + if (mainShape && mainShape->isCompound()) { // Destroy compound bulletdelete(mainShape); + } mainShape = NULL; |