[Soc-2005-cvs] CVS commit: soc-blender/extern/bullet/Bullet/CollisionShapes CollisionShape.h ConvexShape.h CylinderShape.h TriangleMeshShape.cpp TriangleMeshShape.h soc-blender/extern/bullet/Bullet/NarrowPhaseCollision PersistentManifold.cpp RaycastCallback.cpp SubSimplexConvexCast.cpp soc-blender/source/blender/blenkernel BKE_modifier.h ...

[Chris Want]

hos (Chris Want) 2005/09/11 20:35:35 CEST

  Modified files:
    soc-blender/extern/bullet/Bullet/CollisionShapes 
                                                     CollisionShape.h 
                                                     ConvexShape.h 
                                                     CylinderShape.h 
                                                     TriangleMeshShape.cpp 
                                                     TriangleMeshShape.h 
    soc-blender/extern/bullet/Bullet/NarrowPhaseCollision 
                                                          PersistentManifold.cpp 
                                                          RaycastCallback.cpp 
                                                          SubSimplexConvexCast.cpp 
    soc-blender/source/blender/blenkernel BKE_modifier.h 
    soc-blender/source/blender/blenkernel/intern modifier.c 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.3       +1 -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.2&r2=1.3&cvsroot=soc-2005>
  1.2       +4 -0      soc-blender/extern/bullet/Bullet/CollisionShapes/ConvexShape.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/CollisionShapes/ConvexShape.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.3       +5 -0      soc-blender/extern/bullet/Bullet/CollisionShapes/CylinderShape.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/CollisionShapes/CylinderShape.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.5       +7 -0      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.4&r2=1.5&cvsroot=soc-2005>
  1.3       +1 -0      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.2&r2=1.3&cvsroot=soc-2005>
  1.4       +6 -1      soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/PersistentManifold.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/PersistentManifold.cpp.diff?r1=1.3&r2=1.4&cvsroot=soc-2005>
  1.4       +2 -0      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.3&r2=1.4&cvsroot=soc-2005>
  1.3       +0 -2      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.2&r2=1.3&cvsroot=soc-2005>
  1.7       +1 -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.6&r2=1.7&cvsroot=soc-2005>
  1.11      +7 -5      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.10&r2=1.11&cvsroot=soc-2005>