[Soc-2005-cvs] CVS commit: soc-blender/extern/bullet/Bullet/CollisionShapes TriangleMeshShape.cpp soc-blender/extern/bullet/Bullet/NarrowPhaseCollision RaycastCallback.cpp SubSimplexConvexCast.cpp soc-blender/extern/bullet/BulletDynamics/CollisionDispatch ConvexConcaveCollisionAlgorithm.cpp ConvexConcaveCollisionAlgorithm.h soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics CcdPhysicsController.cpp CcdPhysicsController.h CcdPhysicsEnvironment.cpp ...

[Chris Want]

hos (Chris Want) 2005/08/19 21:34:09 CEST

  Modified files:
    soc-blender/extern/bullet/Bullet/CollisionShapes 
                                                     TriangleMeshShape.cpp 
    soc-blender/extern/bullet/Bullet/NarrowPhaseCollision 
                                                          RaycastCallback.cpp 
                                                          SubSimplexConvexCast.cpp 
    soc-blender/extern/bullet/BulletDynamics/CollisionDispatch 
                                                               ConvexConcaveCollisionAlgorithm.cpp 
                                                               ConvexConcaveCollisionAlgorithm.h 
    soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics 
                                                                 CcdPhysicsController.cpp 
                                                                 CcdPhysicsController.h 
                                                                 CcdPhysicsEnvironment.cpp 
    soc-blender/extern/bullet/LinearMath SimdScalar.h 
    soc-blender/source   nan_definitions.mk 
    soc-blender/source/blender/blenkernel/intern modifier.c 
    soc-blender/source/blender/src drawarmature.c 
    soc-blender/source/gameengine/Ketsji 
                                         KX_BulletPhysicsController.cpp 
    soc-blender/source/gameengine/Physics/Bullet 
                                                 CcdPhysicsController.cpp 
                                                 CcdPhysicsController.h 
                                                 CcdPhysicsEnvironment.cpp 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.4       +2 -1      soc-blender/extern/bullet/Bullet/CollisionShapes/TriangleMeshShape.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/CollisionShapes/TriangleMeshShape.cpp.diff?r1=1.3&r2=1.4&cvsroot=soc-2005>
  1.3       +1 -3      soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.2       +2 -0      soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/SubSimplexConvexCast.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/SubSimplexConvexCast.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.4       +6 -1      soc-blender/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp.diff?r1=1.3&r2=1.4&cvsroot=soc-2005>
  1.3       +2 -1      soc-blender/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.4       +28 -1     soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp.diff?r1=1.3&r2=1.4&cvsroot=soc-2005>
  1.4       +4 -0      soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.h.diff?r1=1.3&r2=1.4&cvsroot=soc-2005>
  1.4       +40 -83    soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp.diff?r1=1.3&r2=1.4&cvsroot=soc-2005>
  1.2       +6 -0      soc-blender/extern/bullet/LinearMath/SimdScalar.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/LinearMath/SimdScalar.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.2       +2 -1      soc-blender/source/nan_definitions.mk
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/nan_definitions.mk.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.7       +6 -12     soc-blender/source/blender/blenkernel/intern/modifier.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/blenkernel/intern/modifier.c.diff?r1=1.6&r2=1.7&cvsroot=soc-2005>
  1.4       +549 -75   soc-blender/source/blender/src/drawarmature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/src/drawarmature.c.diff?r1=1.3&r2=1.4&cvsroot=soc-2005>
  1.3       +0 -5      soc-blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.5       +28 -1     soc-blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp.diff?r1=1.4&r2=1.5&cvsroot=soc-2005>
  1.4       +4 -0      soc-blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h.diff?r1=1.3&r2=1.4&cvsroot=soc-2005>
  1.5       +41 -84    soc-blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp.diff?r1=1.4&r2=1.5&cvsroot=soc-2005>