[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13535] trunk/blender/extern/bullet2/src/ BulletCollision: Reverting some of the previous commit: forgot some variables are used when

[Ken Hughes]

Revision: 13535
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13535
Author:   khughes
Date:     2008-02-03 02:52:41 +0100 (Sun, 03 Feb 2008)

Log Message:
-----------
Reverting some of the previous commit: forgot some variables are used when 
btAssert() is active.

Modified Paths:
--------------
    trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp

Modified: trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp	2008-02-03 01:33:35 UTC (rev 13534)
+++ trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp	2008-02-03 01:52:41 UTC (rev 13535)
@@ -85,6 +85,7 @@
 
 	btSimpleBroadphaseProxy* proxy1 = &m_proxies[0];
 		
+	int	index = int(proxy - proxy1);
 	btAssert(index == freeIndex);
 
 	m_pProxies[m_numProxies] = proxy;

Modified: trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp	2008-02-03 01:33:35 UTC (rev 13534)
+++ trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp	2008-02-03 01:52:41 UTC (rev 13535)
@@ -528,6 +528,7 @@
 		splitIndex = startIndex+ (numIndices>>1);
 	}
 
+	bool unbal = (splitIndex==startIndex) || (splitIndex == (endIndex));
 	btAssert(!unbal);
 
 	return splitIndex;