Merge remote-tracking branch 'upstream/master'

2017-06-02 18:26:04 -07:00
parent 0a29c8d9af 518c7ec00e
commit bfcbb339cf
126 changed files with 111577 additions and 2758 deletions
--- a/src/Bullet3Common/b3HashMap.h
+++ b/src/Bullet3Common/b3HashMap.h
@@ -44,8 +44,8 @@ struct b3HashString

 		/* Fowler / Noll / Vo (FNV) Hash */
 		unsigned int hash = InitialFNV;
-		
-		for(int i = 0; m_string[i]; i++)
+		int len = m_string.length();
+		for(int i = 0; i<len; i++)
 		{
 			hash = hash ^ (m_string[i]);       /* xor  the low 8 bits */
 			hash = hash * FNVMultiple;  /* multiply by the magic number */