← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.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/CollisionShapes/btCapsuleShape.cpp
55
55
                btVector3 pos(0,0,0);
56
56
                pos[getUpAxis()] = getHalfHeight();
57
57
 
58
 
                vtx = pos +vec*m_localScaling*(radius) - vec * getMargin();
 
58
                vtx = pos +vec*(radius) - vec * getMargin();
59
59
                newDot = vec.dot(vtx);
60
60
                if (newDot > maxDot)
61
61
                {
67
67
                btVector3 pos(0,0,0);
68
68
                pos[getUpAxis()] = -getHalfHeight();
69
69
 
70
 
                vtx = pos +vec*m_localScaling*(radius) - vec * getMargin();
 
70
                vtx = pos +vec*(radius) - vec * getMargin();
71
71
                newDot = vec.dot(vtx);
72
72
                if (newDot > maxDot)
73
73
                {
96
96
                {
97
97
                        btVector3 pos(0,0,0);
98
98
                        pos[getUpAxis()] = getHalfHeight();
99
 
                        vtx = pos +vec*m_localScaling*(radius) - vec * getMargin();
 
99
                        vtx = pos +vec*(radius) - vec * getMargin();
100
100
                        newDot = vec.dot(vtx);
101
101
                        if (newDot > maxDot)
102
102
                        {
107
107
                {
108
108
                        btVector3 pos(0,0,0);
109
109
                        pos[getUpAxis()] = -getHalfHeight();
110
 
                        vtx = pos +vec*m_localScaling*(radius) - vec * getMargin();
 
110
                        vtx = pos +vec*(radius) - vec * getMargin();
111
111
                        newDot = vec.dot(vtx);
112
112
                        if (newDot > maxDot)
113
113
                        {