Commit of recent trunk merge.

config/linux2-config.py

@@ -144,7 +144,7 @@ BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 WITH_BF_OGG = False  # -DWITH_OGG 
 BF_OGG = '/usr'
 BF_OGG_INC = '${BF_OGG}/include'
-BF_OGG_LIB = 'ogg vorbis theoraenc theoradec'
+BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'
 
 WITH_BF_OPENJPEG = True 
 BF_OPENJPEG = '#extern/libopenjpeg'

extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp

@@ -172,6 +172,9 @@ int btPersistentManifold::addManifoldPoint(const btManifoldPoint& newPoint)
 #if MANIFOLD_CACHE_SIZE >= 4
 		//sort cache so best points come first, based on area
 		insertIndex = sortCachedPoints(newPoint);
+		
+		if (insertIndex<0)
+			insertIndex=0;
 #else
 		insertIndex = 0;
 #endif
@@ -180,11 +183,7 @@ int btPersistentManifold::addManifoldPoint(const btManifoldPoint& newPoint)
 	} else
 	{
 		m_cachedPoints++;
-
-		
 	}
-	if (insertIndex<0)
-		insertIndex=0;
 
 	btAssert(m_pointCache[insertIndex].m_userPersistentData==0);
 	m_pointCache[insertIndex] = newPoint;

intern/boolop/intern/BOP_Merge2.cpp

 /**
  *
- * $Id: BOP_Merge22.cpp 14444 2008-04-16 22:40:48Z hos $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *

intern/boolop/intern/BOP_Misc.h

 /**
  *
- * $Id: BOP_Misc.h 14444 2008-04-16 22:40:48Z khughes $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *