Fix multi-statement macro call not being covered.

2018-10-07 22:47:10 +02:00 · 2018-10-07 22:47:10 +02:00 · 56005772cd
commit 56005772cd
parent b17e71b6e5
2 changed files with 6 additions and 4 deletions
--- 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
--- 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;