2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD

Notes:
* blenderbuttons and ICON_SNAP_PEEL_OBJECT were not merged.

4 files changed, 25 insertions, 10 deletions

diff --git a/extern/bullet2/make/msvc_9_0/Bullet.vcproj b/extern/bullet2/make/msvc_9_0/Bullet.vcproj
index e64cf4c8564..9c8f9668f56 100644
--- a/extern/bullet2/make/msvc_9_0/Bullet.vcproj
+++ b/extern/bullet2/make/msvc_9_0/Bullet.vcproj
@@ -445,6 +445,10 @@
 					Name="Dynamics"

 					>

 					<File

+						RelativePath="..\..\src\BulletDynamics\Dynamics\btActionInterface.h"

+						>

+					</File>

+					<File

 						RelativePath="..\..\src\BulletDynamics\Dynamics\btContinuousDynamicsWorld.cpp"

 						>

 					</File>

diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
index d4e29882d37..eecf927ee10 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
+++ b/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;
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
index ea2e0ad2a2b..b6231a8fda6 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
@@ -350,12 +350,13 @@ int	btDiscreteDynamicsWorld::stepSimulation( btScalar timeStep,int maxSubSteps,
 		for (int i=0;i<clampedSimulationSteps;i++)
 		{
 			internalSingleStepSimulation(fixedTimeStep);
-			synchronizeMotionStates();
+			//for Blender, no need to synchronize here, it is done in blender anyway
+			//synchronizeMotionStates();
 		}
 
 	} 
-
-	synchronizeMotionStates();
+	//else
+	//	synchronizeMotionStates();
 
 	clearForces();
 
@@ -725,9 +726,13 @@ void	btDiscreteDynamicsWorld::calculateSimulationIslands()
 			{
 				if (colObj0->isActive() || colObj1->isActive())
 				{
-
-					getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(),
-						(colObj1)->getIslandTag());
+					if ((colObj0)->getIslandTag() != -1 && (colObj1)->getIslandTag() != -1)
+					{
+					
+						getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(),
+							(colObj1)->getIslandTag());
+					}
+					
 				}
 			}
 		}
diff --git a/extern/libopenjpeg/opj_includes.h b/extern/libopenjpeg/opj_includes.h
index 80d43df990f..3464cfcf9ed 100644
--- a/extern/libopenjpeg/opj_includes.h
+++ b/extern/libopenjpeg/opj_includes.h
@@ -88,6 +88,12 @@ Most compilers implement their own version of this keyword ...
 
 /* MSVC does not have lrintf */
 #ifdef _MSC_VER
+#ifdef _M_X64
+#include <emmintrin.h>
+static INLINE long lrintf(float f) {
+        return _mm_cvtss_si32(_mm_load_ss(&f));
+} 
+#else
 static INLINE long lrintf(float f){
 	int i;
 
@@ -99,6 +105,7 @@ static INLINE long lrintf(float f){
 	return i;
 }
 #endif
+#endif
 
 #include "j2k_lib.h"
 #include "opj_malloc.h"