Merge remote-tracking branch 'bp/master'

This commit is contained in:
Erwin Coumans (Google)
2015-04-28 20:57:41 -07:00
2 changed files with 5 additions and 3 deletions

View File

@@ -73,7 +73,7 @@ public:
public:
#if defined(BT_USE_SSE) || defined(BT_USE_NEON)
#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
// Set Vector
SIMD_FORCE_INLINE btQuadWord(const btSimdFloat4 vec)