Merge remote-tracking branch 'bp/master'

2017-05-04 10:51:42 -07:00
parent 4602fbba34 87a24dba84
commit a7d08ca9d7
27 changed files with 707 additions and 10 deletions
--- a/src/BulletDynamics/Featherstone/btMultiBody.h
+++ b/src/BulletDynamics/Featherstone/btMultiBody.h
@@ -140,6 +140,11 @@ public:
 		return m_baseCollider;
 	}

+	btMultiBodyLinkCollider* getLinkCollider(int index)
+	{
+		return m_colliders[index];
+	}
+
    //
    // get parent
    // input: link num from 0 to num_links-1