← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Converter/BL_ArmatureObject.cpp
1
1
/**
2
 
 * $Id: BL_ArmatureObject.cpp 16567 2008-09-17 01:29:54Z blendix $
 
2
 * $Id: BL_ArmatureObject.cpp 19871 2009-04-22 14:42:00Z campbellbarton $
3
3
 *
4
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
70
70
CValue* BL_ArmatureObject::GetReplica()
71
71
{
72
72
        BL_ArmatureObject* replica = new BL_ArmatureObject(*this);
73
 
        
74
 
        // this will copy properties and so on...
75
 
        CValue::AddDataToReplica(replica);
76
 
 
77
 
        ProcessReplica(replica);
 
73
        replica->ProcessReplica();
78
74
        return replica;
79
75
}
80
76
 
81
 
void BL_ArmatureObject::ProcessReplica(BL_ArmatureObject *replica)
 
77
void BL_ArmatureObject::ProcessReplica()
82
78
{
83
 
        KX_GameObject::ProcessReplica(replica);
 
79
        bPose *pose= m_pose;
 
80
        KX_GameObject::ProcessReplica();
84
81
 
85
 
        replica->m_pose = NULL;
86
 
        game_copy_pose(&replica->m_pose, m_pose);
 
82
        m_pose = NULL;
 
83
        game_copy_pose(&m_pose, pose);
87
84
}
88
85
 
89
86
BL_ArmatureObject::~BL_ArmatureObject()