← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.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
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/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
13
13
3. This notice may not be removed or altered from any source distribution.
14
14
*/
15
15
 
16
 
#ifndef SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
17
 
#define SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
 
16
#ifndef BT_SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
 
17
#define BT_SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
18
18
 
19
19
#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
20
20
#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
152
152
 
153
153
};
154
154
 
155
 
#endif //SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
 
155
#endif //BT_SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H