Merge branch 'master' of https://github.com/erwincoumans/bullet3

# Conflicts: # examples/SharedMemory/PhysicsServerCommandProcessor.cpp
2018-06-01 09:35:15 -07:00
parent 2d40a18315 00c8f8f68e
commit 92579f9196
18 changed files with 296 additions and 119 deletions
--- a/examples/Importers/ImportURDFDemo/URDF2Bullet.cpp
+++ b/examples/Importers/ImportURDFDemo/URDF2Bullet.cpp
@@ -595,6 +595,11 @@ void ConvertURDF2BulletInternal(
 					}
                } else
                {
+					//todo: fix the crash it can cause
+					//if (cache.m_bulletMultiBody->getBaseMass()==0)
+					//{
+					//	col->setCollisionFlags(btCollisionObject::CF_KINEMATIC_OBJECT);//:CF_STATIC_OBJECT);
+					//}
                    cache.m_bulletMultiBody->setBaseCollider(col);
                }
            }