diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-15 13:03:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-15 13:03:09 +0300 |
| commit | 9e2ea6c500a3a5774a1aa174b6801d3a9edadd9a (patch) | |
| tree | 25e8fd41033e82b6cb04a00b52390f899dc085e5 /source/blender/collada/ArmatureImporter.cpp | |
| parent | f3a8f97fcfa39d5dfe3e1f9d1b534e4f42ba9689 (diff) | |
| parent | 0f2efce6c50718d7745a6dc1613acf62a186cc05 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/ArmatureImporter.cpp')
| -rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index b2794b3bd23..f24688479af 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -104,7 +104,7 @@ int ArmatureImporter::create_bone(SkinInfo *skin, COLLADAFW::Node *node, EditBon it = std::find(finished_joints.begin(), finished_joints.end(), node); if (it != finished_joints.end()) return chain_length; - EditBone *bone = ED_armature_edit_bone_add(arm, (char *)bc_get_joint_name(node)); + EditBone *bone = ED_armature_ebone_add(arm, bc_get_joint_name(node)); totbone++; /* @@ -636,8 +636,8 @@ Object *ArmatureImporter::create_armature_bones(SkinInfo& skin) } void ArmatureImporter::set_pose(Object *ob_arm, COLLADAFW::Node *root_node, const char *parentname, float parent_mat[4][4]) -{ - char *bone_name = (char *) bc_get_joint_name(root_node); +{ + const char *bone_name = bc_get_joint_name(root_node); float mat[4][4]; float obmat[4][4]; |