From 56005772cd2fcbd095f2d14c6d13e83e632d0775 Mon Sep 17 00:00:00 2001 From: J08nY Date: Sun, 7 Oct 2018 22:47:10 +0200 Subject: Fix multi-statement macro call not being covered. --- modules/bullet/bullet_utilities.h | 7 ++++--- modules/bullet/collision_object_bullet.cpp | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'modules') 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; -- cgit v1.2.3