diff options
author | Jens Verwiebe <info@jensverwiebe.de> | 2013-12-17 17:14:03 +0400 |
---|---|---|
committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-12-17 17:14:03 +0400 |
commit | 6e88e3eda49ecffa58c6cc3f3524a5594d754b4b (patch) | |
tree | 79564780e70d024fbb4a969adffae6bbf9948e79 /source/blender/collada | |
parent | f5076d54cb3a95ab583cddb7de07ed746d2e2be6 (diff) |
Fix compile after last commit, casting to (bArmature *), kudos to JesterKing
Diffstat (limited to 'source/blender/collada')
-rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index ddc05b57e62..6d4308be5b5 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -341,7 +341,7 @@ void ArmatureImporter::create_armature_bones( ) if (!ob_arm) continue; - ED_armature_to_edit(ob_arm->data); + ED_armature_to_edit((bArmature *)ob_arm->data); /* * TODO: @@ -356,12 +356,12 @@ void ArmatureImporter::create_armature_bones( ) // exit armature edit mode unskinned_armature_map[(*ri)->getUniqueId()] = ob_arm; - ED_armature_from_edit(ob_arm->data); + ED_armature_from_edit((bArmature *)ob_arm->data); //This serves no purpose, as pose is automatically reset later, in BKE_where_is_bone() //set_pose(ob_arm, *ri, NULL, NULL); - ED_armature_edit_free(ob_arm->data); + ED_armature_edit_free((bArmature *)ob_arm->data); DAG_id_tag_update(&ob_arm->id, OB_RECALC_OB | OB_RECALC_DATA); } } @@ -454,7 +454,7 @@ void ArmatureImporter::create_armature_bones(SkinInfo& skin) } // enter armature edit mode - ED_armature_to_edit(ob_arm->data); + ED_armature_to_edit((bArmature *)ob_arm->data); leaf_bones.clear(); totbone = 0; @@ -485,8 +485,8 @@ void ArmatureImporter::create_armature_bones(SkinInfo& skin) fix_leaf_bones(); // exit armature edit mode - ED_armature_from_edit(ob_arm->data); - ED_armature_edit_free(ob_arm->data); + ED_armature_from_edit((bArmature *)ob_arm->data); + ED_armature_edit_free((bArmature *)ob_arm->data); DAG_id_tag_update(&ob_arm->id, OB_RECALC_OB | OB_RECALC_DATA); } |