← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/gameengine/Converter/BL_ArmatureConstraint.cpp

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Converter/BL_ArmatureConstraint.cpp
189
189
                if (m_blendsubtarget && m_subtarget) {
190
190
                        m_subtarget->UpdateBlenderObjectMatrix(m_blendsubtarget);
191
191
                        if (m_subpose && m_subtarget->GetGameObjectType() == SCA_IObject::OBJ_ARMATURE)
192
 
                                m_blendsubtarget->pose = ((BL_ArmatureObject*)m_target)->GetOrigPose();
 
192
                                m_blendsubtarget->pose = ((BL_ArmatureObject*)m_subtarget)->GetOrigPose();
193
193
                }
194
194
        }
195
195
}