diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-05 20:03:57 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-05 20:03:57 +0400 |
| commit | 1dccd4c98a4909383b9c11f7c2ee987e22833dad (patch) | |
| tree | 3d127436243536d6ceaba4cb884249156ba215cd /source/blender/collada/SkinInfo.cpp | |
| parent | ff4ff9c8a429d9869e7056417bc7acd47a545eb2 (diff) | |
code cleanup: naming - pose/armature/image
also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
Diffstat (limited to 'source/blender/collada/SkinInfo.cpp')
| -rw-r--r-- | source/blender/collada/SkinInfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/SkinInfo.cpp b/source/blender/collada/SkinInfo.cpp index d807b049152..f7cb7dc96c2 100644 --- a/source/blender/collada/SkinInfo.cpp +++ b/source/blender/collada/SkinInfo.cpp @@ -178,7 +178,7 @@ bool SkinInfo::get_joint_inv_bind_matrix(float inv_bind_mat[][4], COLLADAFW::Nod return false; } -Object *SkinInfo::get_armature() +Object *SkinInfo::BKE_armature_from_object() { return ob_arm; } @@ -288,7 +288,7 @@ void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::Unique bPoseChannel *SkinInfo::get_pose_channel_from_node(COLLADAFW::Node *node) { - return get_pose_channel(ob_arm->pose, bc_get_joint_name(node)); + return BKE_pose_channel_find_name(ob_arm->pose, bc_get_joint_name(node)); } void SkinInfo::set_parent(Object *_parent) |