[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19182] trunk/blender/extern/bullet2/src/ BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp: Fix build: don' t use Character stuff, it wasn't meant to be included in Blender/extern/ bullet2 distro.

[Erwin Coumans]

Revision: 19182
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19182
Author:   erwin
Date:     2009-03-03 15:31:10 +0100 (Tue, 03 Mar 2009)

Log Message:
-----------
Fix build: don't use Character stuff, it wasn't meant to be included in 
Blender/extern/bullet2 distro.

Modified Paths:
--------------
    
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp

Modified: 
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
===================================================================
--- 
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
        2009-03-03 13:15:40 UTC (rev 19181)
+++ 
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
        2009-03-03 14:31:10 UTC (rev 19182)
@@ -56,8 +56,10 @@
 #include "BulletDynamics/Vehicle/btRaycastVehicle.h"
 #include "BulletDynamics/Vehicle/btVehicleRaycaster.h"
 #include "BulletDynamics/Vehicle/btWheelInfo.h"
+#ifdef USE_CHARACTER
 //character
 #include "BulletDynamics/Character/btCharacterControllerInterface.h"
+#endif //USE_CHARACTER
 
 #include "LinearMath/btIDebugDraw.h"
 #include "LinearMath/btQuickprof.h"
@@ -506,6 +508,7 @@
 
 void   btDiscreteDynamicsWorld::updateCharacters(btScalar timeStep)
 {
+#ifdef USE_CHARACTER
        BT_PROFILE("updateCharacters");
        
        for ( int i=0;i<m_characters.size();i++)
@@ -514,6 +517,7 @@
                character->preStep (this);
                character->playerStep (this,timeStep);
        }
+#endif //USE_CHARACTER
 }
 
        
@@ -584,12 +588,16 @@
 
 void   btDiscreteDynamicsWorld::addCharacter(btCharacterControllerInterface* 
character)
 {
+#ifdef USE_CHARACTER
        m_characters.push_back(character);
+#endif //USE_CHARACTER
 }
 
 void   
btDiscreteDynamicsWorld::removeCharacter(btCharacterControllerInterface* 
character)
 {
+#ifdef USE_CHARACTER
        m_characters.remove(character);
+#endif //USE_CHARACTER
 }
 
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs