diff options
Diffstat (limited to 'intern/itasc')
| -rw-r--r-- | intern/itasc/Armature.cpp | 2 | ||||
| -rw-r--r-- | intern/itasc/Armature.hpp | 2 | ||||
| -rw-r--r-- | intern/itasc/kdl/segment.cpp | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/intern/itasc/Armature.cpp b/intern/itasc/Armature.cpp index 78780ed8ba3..19f37a79484 100644 --- a/intern/itasc/Armature.cpp +++ b/intern/itasc/Armature.cpp @@ -32,7 +32,9 @@ Armature::Armature(): m_qCCh(-1), m_qCTs(0), m_yCCh(-1), +#if 0 m_yCTs(0), +#endif m_qKdl(), m_oldqKdl(), m_newqKdl(), diff --git a/intern/itasc/Armature.hpp b/intern/itasc/Armature.hpp index 63d1899f4e9..3167247ab03 100644 --- a/intern/itasc/Armature.hpp +++ b/intern/itasc/Armature.hpp @@ -111,7 +111,9 @@ private: int m_qCCh; CacheTS m_qCTs; int m_yCCh; +#if 0 CacheTS m_yCTs; +#endif JntArray m_qKdl; JntArray m_oldqKdl; JntArray m_newqKdl; diff --git a/intern/itasc/kdl/segment.cpp b/intern/itasc/kdl/segment.cpp index f963559c4c8..fbb775f6682 100644 --- a/intern/itasc/kdl/segment.cpp +++ b/intern/itasc/kdl/segment.cpp @@ -25,13 +25,13 @@ namespace KDL { Segment::Segment(const Joint& _joint, const Frame& _f_tip, const Inertia& _M): - joint(_joint),M(_M), + M(_M),joint(_joint), f_tip(_f_tip) { } Segment::Segment(const Segment& in): - joint(in.joint),M(in.M), + M(in.M),joint(in.joint), f_tip(in.f_tip) { } |