[Soc-2005-cvs] CVS commit: soc-blender/extern/bullet/Bullet/CollisionShapes CollisionShape.h StridingMeshInterface.h TriangleMesh.h TriangleMeshShape.cpp TriangleMeshShape.h soc-blender/extern/bullet/Bullet/NarrowPhaseCollision ContinuousConvexCollision.cpp soc-blender/extern/bullet/BulletDynamics/CollisionDispatch ConvexConcaveCollisionAlgorithm.cpp ConvexConcaveCollisionAlgorithm.h soc-blender/extern/bullet/LinearMath ...

[Chris Want]

hos (Chris Want) 2005/07/29 03:12:56 CEST

  Modified files:
    soc-blender/extern/bullet/Bullet/CollisionShapes 
                                                     CollisionShape.h 
                                                     StridingMeshInterface.h 
                                                     TriangleMesh.h 
                                                     TriangleMeshShape.cpp 
                                                     TriangleMeshShape.h 
    soc-blender/extern/bullet/Bullet/NarrowPhaseCollision 
                                                          ContinuousConvexCollision.cpp 
    soc-blender/extern/bullet/BulletDynamics/CollisionDispatch 
                                                               ConvexConcaveCollisionAlgorithm.cpp 
                                                               ConvexConcaveCollisionAlgorithm.h 
    soc-blender/extern/bullet/LinearMath SimdQuadWord.h 
    soc-blender/source/blender/blenkernel BKE_modifier.h 
    soc-blender/source/blender/blenkernel/intern modifier.c 
    soc-blender/source/blender/src drawarmature.c 
    soc-blender/source/gameengine/Physics/Bullet 
                                                 CcdPhysicsController.cpp 
                                                 CcdPhysicsEnvironment.cpp 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.2       +2 -0      soc-blender/extern/bullet/Bullet/CollisionShapes/CollisionShape.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/CollisionShapes/CollisionShape.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.2       +3 -1      soc-blender/extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.2       +2 -2      soc-blender/extern/bullet/Bullet/CollisionShapes/TriangleMesh.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/CollisionShapes/TriangleMesh.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.2       +5 -4      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.1&r2=1.2&cvsroot=soc-2005>
  1.2       +12 -1     soc-blender/extern/bullet/Bullet/CollisionShapes/TriangleMeshShape.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/CollisionShapes/TriangleMeshShape.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.2       +7 -2      soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.2       +9 -3      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.1&r2=1.2&cvsroot=soc-2005>
  1.2       +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.1&r2=1.2&cvsroot=soc-2005>
  1.2       +2 -4      soc-blender/extern/bullet/LinearMath/SimdQuadWord.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/LinearMath/SimdQuadWord.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.3       +10 -1     soc-blender/source/blender/blenkernel/BKE_modifier.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/blenkernel/BKE_modifier.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.4       +91 -0     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.3&r2=1.4&cvsroot=soc-2005>
  1.3       +7 -4      soc-blender/source/blender/src/drawarmature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/src/drawarmature.c.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.2       +1 -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.1&r2=1.2&cvsroot=soc-2005>
  1.2       +48 -1     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.1&r2=1.2&cvsroot=soc-2005>