← Back to branch summary

~ubuntu-branches/ubuntu/maverick/blender/maverick

« back to all changes in this revision

Viewing changes to extern/bullet2/src/LinearMath/btGeometryUtil.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Khashayar Naderehvandi, Khashayar Naderehvandi, Alessio Treglia
  • Date: 2009-01-22 16:53:59 UTC
  • mfrom: (14.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090122165359-v0996tn7fbit64ni
Tags: 2.48a+dfsg-1ubuntu1
https://launchpad.net/bugs/320045
[ Khashayar Naderehvandi ]
* Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
  - Add patch correcting header file locations.
  - Add libvorbis-dev and libgsm1-dev to Build-Depends.
  - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

[ Alessio Treglia ]
* Add missing previous changelog entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
extern/bullet2/src/LinearMath/btGeometryUtil.cpp
22
22
  can be used by probes that are checking whether the
23
23
  library is actually installed.
24
24
*/
25
 
extern "C" void btBulletMathProbe () {}
 
25
extern "C"
 
26
{       
 
27
        void btBulletMathProbe ();
 
28
 
 
29
        void btBulletMathProbe () {}
 
30
}
26
31
 
27
32
 
28
33
bool    btGeometryUtil::isPointInsidePlanes(const btAlignedObjectArray<btVector3>& planeEquations, const btVector3& point, btScalar     margin)
57
62
        return true;
58
63
}
59
64
 
 
65
bool notExist(const btVector3& planeEquation,const btAlignedObjectArray<btVector3>& planeEquations);
 
66
 
60
67
bool notExist(const btVector3& planeEquation,const btAlignedObjectArray<btVector3>& planeEquations)
61
68
{
62
69
        int numbrushes = planeEquations.size();