← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
64
64
        btAssert(m_manifoldPtr);
65
65
        //order in manifold needs to match
66
66
 
67
 
//      if (depth > m_manifoldPtr->getContactBreakingThreshold())
68
 
        if (depth > m_manifoldPtr->getContactProcessingThreshold())
 
67
        if (depth > m_manifoldPtr->getContactBreakingThreshold())
 
68
//      if (depth > m_manifoldPtr->getContactProcessingThreshold())
69
69
                return;
70
70
 
71
71
        bool isSwapped = m_manifoldPtr->getBody0() != m_body0;