~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
                bool                    calcPenDepth( btSimplexSolverInterface& simplexSolver,
29
29
                                                                          const btConvexShape* pConvexA, const btConvexShape* pConvexB,
30
30
                                                                          const btTransform& transformA, const btTransform& transformB,
31
 
                                                                          btVector3& v, btPoint3& wWitnessOnA, btPoint3& wWitnessOnB,
 
31
                                                                          btVector3& v, btVector3& wWitnessOnA, btVector3& wWitnessOnB,
32
32
                                                                          class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc );
33
33
 
34
34
        private :