Merge pull request #22841 from J08nY/fix/collision-object-macro

Fix multi-statement macro call not being covered.
godotengine · Oct 8, 2018 · 0063ba9 · 0063ba9
2 parents 328679f + 5600577
commit 0063ba9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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;