Merge pull request #757 from erwincoumans/master

fix in structure alignment of btMultiBodyLinkDoubleData and btMultiBo…
2016-08-26 12:08:29 -07:00
parent c29d445b94 c5164e503f
commit 79be5800cb
11 changed files with 619 additions and 623 deletions
--- a/examples/Importers/ImportURDFDemo/ImportURDFSetup.cpp
+++ b/examples/Importers/ImportURDFDemo/ImportURDFSetup.cpp
@@ -1,7 +1,7 @@

 #include "ImportURDFSetup.h"
 #include "BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h"
-
+//#define TEST_MULTIBODY_SERIALIZATION 1

 #include "BulletDynamics/Featherstone/btMultiBodyLinkCollider.h"
 #include "Bullet3Common/b3FileUtils.h"
@@ -377,6 +377,7 @@ void ImportUrdfSetup::initPhysics()
 		
 	}

+
 #ifdef TEST_MULTIBODY_SERIALIZATION
 	m_dynamicsWorld->serialize(s);
 	b3ResourcePath p;