fix 2 potential data race conditions.

2018-11-08 14:41:22 -08:00
parent 036d75bc04
commit 642c6a71d2
2 changed files with 18 additions and 14 deletions
--- a/examples/Importers/ImportURDFDemo/URDF2Bullet.cpp
+++ b/examples/Importers/ImportURDFDemo/URDF2Bullet.cpp
@@ -1,6 +1,9 @@
+
 #include <stdio.h>
 #include "LinearMath/btTransform.h"
+#include "LinearMath/btThreads.h"
 #include "BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h"
+
 #include "BulletCollision/CollisionShapes/btCompoundShape.h"
 #include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"

@@ -28,10 +31,13 @@ static btVector4 colors[4] =

 static btVector4 selectColor2()
 {
+	static btSpinMutex sMutex;
+	sMutex.lock();
 	static int curColor = 0;
 	btVector4 color = colors[curColor];
 	curColor++;
 	curColor &= 3;
+	sMutex.unlock();
 	return color;
 }