[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16497] trunk/blender/extern/bullet2: Update MSVC project file for latest Bullet revision.

[Benoit Bolsee]

Revision: 16497
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16497
Author:   ben2610
Date:     2008-09-13 10:05:16 +0200 (Sat, 13 Sep 2008)

Log Message:
-----------
Update MSVC project file for latest Bullet revision. Remove compound patch as it is now included in Bullet trunk.

Modified Paths:
--------------
    trunk/blender/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj

Removed Paths:
-------------
    trunk/blender/extern/bullet2/bullet_compound_raycast.patch

Deleted: trunk/blender/extern/bullet2/bullet_compound_raycast.patch
===================================================================
--- trunk/blender/extern/bullet2/bullet_compound_raycast.patch	2008-09-13 07:06:43 UTC (rev 16496)
+++ trunk/blender/extern/bullet2/bullet_compound_raycast.patch	2008-09-13 08:05:16 UTC (rev 16497)
@@ -1,39 +0,0 @@
-Index: src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
-===================================================================
---- src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp	(r\x82vision 16464)
-+++ src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp	(copie de travail)
-@@ -379,12 +379,16 @@
- 					btTransform childTrans = compoundShape->getChildTransform(i);
- 					const btCollisionShape* childCollisionShape = compoundShape->getChildShape(i);
- 					btTransform childWorldTrans = colObjWorldTransform * childTrans;
-+					// replace collision shape so that callback can determine the triangle
-+					btCollisionShape* saveCollisionShape = collisionObject->getCollisionShape();
-+					collisionObject->setCollisionShape((btCollisionShape*)childCollisionShape);
- 					rayTestSingle(rayFromTrans,rayToTrans,
- 						collisionObject,
- 						childCollisionShape,
- 						childWorldTrans,
- 						resultCallback);
--
-+					// restore
-+					collisionObject->setCollisionShape(saveCollisionShape);
- 				}
- 			}
- 		}
-@@ -571,11 +575,16 @@
- 					btTransform childTrans = compoundShape->getChildTransform(i);
- 					const btCollisionShape* childCollisionShape = compoundShape->getChildShape(i);
- 					btTransform childWorldTrans = colObjWorldTransform * childTrans;
-+					// replace collision shape so that callback can determine the triangle
-+					btCollisionShape* saveCollisionShape = collisionObject->getCollisionShape();
-+					collisionObject->setCollisionShape((btCollisionShape*)childCollisionShape);
- 					objectQuerySingle(castShape, convexFromTrans,convexToTrans,
- 						collisionObject,
- 						childCollisionShape,
- 						childWorldTrans,
- 						resultCallback, allowedPenetration);
-+					// restore
-+					collisionObject->setCollisionShape(saveCollisionShape);
- 				}
- 			}
- 		}

Modified: trunk/blender/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
===================================================================
--- trunk/blender/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj	2008-09-13 07:06:43 UTC (rev 16496)
+++ trunk/blender/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj	2008-09-13 08:05:16 UTC (rev 16497)
@@ -383,36 +383,6 @@
 						RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btJacobianEntry.h">
 					</File>
 					<File
-						RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeContactJoint.cpp">
-					</File>
-					<File
-						RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeContactJoint.h">
-					</File>
-					<File
-						RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeJoint.cpp">
-					</File>
-					<File
-						RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeJoint.h">
-					</File>
-					<File
-						RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeMacros.h">
-					</File>
-					<File
-						RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeQuickstepConstraintSolver.cpp">
-					</File>
-					<File
-						RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeQuickstepConstraintSolver.h">
-					</File>
-					<File
-						RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeSolverBody.h">
-					</File>
-					<File
-						RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeTypedJoint.cpp">
-					</File>
-					<File
-						RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeTypedJoint.h">
-					</File>
-					<File
 						RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp">
 					</File>
 					<File
@@ -443,12 +413,6 @@
 						RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolverConstraint.h">
 					</File>
 					<File
-						RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSorLcp.cpp">
-					</File>
-					<File
-						RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSorLcp.h">
-					</File>
-					<File
 						RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp">
 					</File>
 					<File
@@ -1058,9 +1022,6 @@
 					RelativePath="..\..\src\LinearMath\btScalar.h">
 				</File>
 				<File
-					RelativePath="..\..\src\LinearMath\btSimdMinMax.h">
-				</File>
-				<File
 					RelativePath="..\..\src\LinearMath\btStackAlloc.h">
 				</File>
 				<File