diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-20 17:45:29 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-20 17:45:29 +0300 |
| commit | aae0598aa233d43d0ffc81a070b2ce20d6871c1d (patch) | |
| tree | 378100f45cf1db972c671a6886496a5604f7ab29 /extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h | |
| parent | 95d7d3c2a6aa91f1dcb33ff0cdfc751e2886d8cd (diff) | |
| parent | d7e4f920fd93a4ae5679e0eb6b228a349ab3b082 (diff) | |
Merge branch 'master' into temp_depsgraph_split_ubereval
Diffstat (limited to 'extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h')
| -rw-r--r-- | extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h index 57ebb47d8e7..628ada4cfb1 100644 --- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h +++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h @@ -280,6 +280,11 @@ public: virtual void setParam(int num, btScalar value, int axis = -1); ///return the local value of parameter virtual btScalar getParam(int num, int axis = -1) const; + + virtual int getFlags() const + { + return m_flags; + } virtual int calculateSerializeBufferSize() const; |