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

2014-10-22 14:47:07 -07:00
parent 1ce647742c 2e1cbc0133
commit a59bedd745
8 changed files with 153 additions and 5 deletions
--- a/Demos3/ImportColladaDemo/LoadMeshFromCollada.cpp
+++ b/Demos3/ImportColladaDemo/LoadMeshFromCollada.cpp
@@ -20,7 +20,6 @@ subject to the following restrictions:
 #include <stdio.h> //fopen
 #include "Bullet3Common/b3AlignedObjectArray.h"
 #include <string>
-#include "OpenGLWindow/OpenGLInclude.h"
 #include "tinyxml/tinyxml.h"

 #include "Bullet3Common/b3FileUtils.h"
--- a/Demos3/ImportColladaDemo/btMatrix4x4.h
+++ b/Demos3/ImportColladaDemo/btMatrix4x4.h
@@ -118,7 +118,7 @@ ATTRIBUTE_ALIGNED16(class) btMatrix4x4
 	}

 	SIMD_FORCE_INLINE btMatrix4x4 
-	btMatrix4x4::operator*=(const btMatrix4x4& m)
+	operator*=(const btMatrix4x4& m)
 	{
 		setValue(
 			m.tdotx(m_el[0]), m.tdoty(m_el[0]), m.tdotz(m_el[0]),m.tdotw(m_el[0]),