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

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h

  • 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
* 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:
363
363
        static float getAverageTreeCollisionTime();
364
364
#endif //TRI_COLLISION_PROFILING
365
365
 
366
 
        static void find_collision(btGImpactQuantizedBvh * boxset1, const btTransform & trans1,
367
 
                btGImpactQuantizedBvh * boxset2, const btTransform & trans2,
 
366
        static void find_collision(const btGImpactQuantizedBvh * boxset1, const btTransform & trans1,
 
367
                const btGImpactQuantizedBvh * boxset2, const btTransform & trans2,
368
368
                btPairSet & collision_pairs);
369
369
};
370
370