diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-29 00:26:55 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-29 00:35:28 +0400 |
| commit | 19a41e5a1095504a524333879593b8945fe8ea06 (patch) | |
| tree | a87097ad414fc186195f58c2fa445c44a92b5ae3 /intern/itasc/Armature.cpp | |
| parent | 28a2d5e2648c304cd47ce70cf698889cbb87a90f (diff) | |
Fix iTaSC build error when building with libc++.
This was using TreeElement before it was fully defined, which gives undefined
behavior that happened to work with other libraries but not libc++.
Based on patch by Marcus von Appen, modifications for brevity and to ensure we
don't dereference invalid memory. Ref T37477.
Diffstat (limited to 'intern/itasc/Armature.cpp')
| -rw-r--r-- | intern/itasc/Armature.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/itasc/Armature.cpp b/intern/itasc/Armature.cpp index e6f5fda4066..0c736566b25 100644 --- a/intern/itasc/Armature.cpp +++ b/intern/itasc/Armature.cpp @@ -402,7 +402,7 @@ bool Armature::finalize() m_armlength = 0.0; for (i=0; i<m_neffector; i++) { length = 0.0; - KDL::SegmentMap::const_iterator sit = m_tree.getSegment(m_effectors[i].name); + KDL::SegmentMap::value_type const *sit = m_tree.getSegmentPtr(m_effectors[i].name); while (sit->first != "root") { Frame tip = sit->second.segment.pose(m_qKdl(sit->second.q_nr)); length += tip.p.Norm(); |