[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56519] trunk/blender/extern/bullet2/src: bullet: Don't use sse in api for windows.

Sergej Reich sergej.reich at googlemail.com
Tue May 7 00:53:11 CEST 2013


Revision: 56519
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56519
Author:   sergof
Date:     2013-05-06 22:53:11 +0000 (Mon, 06 May 2013)
Log Message:
-----------
bullet: Don't use sse in api for windows.

Remove stray BT_USE_SSE_IN_API definitions.
Was causing problems especially for 32 bit windows.

It's not quite clear why they were added in the first place since
this should be defined in btScalar.h, needs further investigation.

Thanks to Francisco De La Cruz (xercesblue) for looking into this.

Should fix [#35071] Bullet Convex Hull Crashes on Win32 with SSE

Modified Paths:
--------------
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
    trunk/blender/extern/bullet2/src/LinearMath/btVector3.cpp

Modified: trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp	2013-05-06 18:44:46 UTC (rev 56518)
+++ trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp	2013-05-06 22:53:11 UTC (rev 56519)
@@ -13,9 +13,9 @@
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#if defined (_WIN32) || defined (__i386__)
-#define BT_USE_SSE_IN_API
-#endif
+//#if defined (_WIN32) || defined (__i386__)
+//#define BT_USE_SSE_IN_API
+//#endif
 
 #include "btConvexHullShape.h"
 #include "BulletCollision/CollisionShapes/btCollisionMargin.h"

Modified: trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp	2013-05-06 18:44:46 UTC (rev 56518)
+++ trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp	2013-05-06 22:53:11 UTC (rev 56519)
@@ -13,9 +13,9 @@
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#if defined (_WIN32) || defined (__i386__)
-#define BT_USE_SSE_IN_API
-#endif
+//#if defined (_WIN32) || defined (__i386__)
+//#define BT_USE_SSE_IN_API
+//#endif
 
 #include "btConvexShape.h"
 #include "btTriangleShape.h"

Modified: trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp	2013-05-06 18:44:46 UTC (rev 56518)
+++ trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp	2013-05-06 22:53:11 UTC (rev 56519)
@@ -13,9 +13,9 @@
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#if defined (_WIN32) || defined (__i386__)
-#define BT_USE_SSE_IN_API
-#endif
+//#if defined (_WIN32) || defined (__i386__)
+//#define BT_USE_SSE_IN_API
+//#endif
 
 #include "btMultiSphereShape.h"
 #include "BulletCollision/CollisionShapes/btCollisionMargin.h"

Modified: trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp	2013-05-06 18:44:46 UTC (rev 56518)
+++ trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp	2013-05-06 22:53:11 UTC (rev 56519)
@@ -12,9 +12,9 @@
 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 */
-#if defined (_WIN32) || defined (__i386__)
-#define BT_USE_SSE_IN_API
-#endif
+//#if defined (_WIN32) || defined (__i386__)
+//#define BT_USE_SSE_IN_API
+//#endif
 
 #include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h"
 #include "btConvexPolyhedron.h"

Modified: trunk/blender/extern/bullet2/src/LinearMath/btVector3.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/LinearMath/btVector3.cpp	2013-05-06 18:44:46 UTC (rev 56518)
+++ trunk/blender/extern/bullet2/src/LinearMath/btVector3.cpp	2013-05-06 22:53:11 UTC (rev 56519)
@@ -15,9 +15,9 @@
  This source version has been altered.
  */
 
-#if defined (_WIN32) || defined (__i386__)
-#define BT_USE_SSE_IN_API
-#endif
+//#if defined (_WIN32) || defined (__i386__)
+//#define BT_USE_SSE_IN_API
+//#endif
 
 
 #include "btVector3.h"




More information about the Bf-blender-cvs mailing list