← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.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/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
25
25
:btTypedObject(type),
26
26
m_userConstraintType(-1),
27
27
m_userConstraintId(-1),
 
28
m_breakingImpulseThreshold(SIMD_INFINITY),
 
29
m_isEnabled(true),
28
30
m_needsFeedback(false),
 
31
m_overrideNumSolverIterations(-1),
29
32
m_rbA(rbA),
30
33
m_rbB(getFixedBody()),
31
34
m_appliedImpulse(btScalar(0.)),
38
41
:btTypedObject(type),
39
42
m_userConstraintType(-1),
40
43
m_userConstraintId(-1),
 
44
m_breakingImpulseThreshold(SIMD_INFINITY),
 
45
m_isEnabled(true),
41
46
m_needsFeedback(false),
 
47
m_overrideNumSolverIterations(-1),
42
48
m_rbA(rbA),
43
49
m_rbB(rbB),
44
50
m_appliedImpulse(btScalar(0.)),
114
120
 
115
121
        tcd->m_objectType = m_objectType;
116
122
        tcd->m_needsFeedback = m_needsFeedback;
 
123
        tcd->m_overrideNumSolverIterations = m_overrideNumSolverIterations;
 
124
        tcd->m_breakingImpulseThreshold = float(m_breakingImpulseThreshold);
 
125
        tcd->m_isEnabled = m_isEnabled? 1: 0;
 
126
        
117
127
        tcd->m_userConstraintId =m_userConstraintId;
118
128
        tcd->m_userConstraintType =m_userConstraintType;
119
129