Fix compile after last commit, casting to (bArmature *), kudos to JesterKing
authorJens Verwiebe <info@jensverwiebe.de>
Tue, 17 Dec 2013 13:14:03 +0000 (14:14 +0100)
committerJens Verwiebe <info@jensverwiebe.de>
Tue, 17 Dec 2013 13:14:03 +0000 (14:14 +0100)
source/blender/collada/ArmatureImporter.cpp

index ddc05b57e62a8eeda520054fb5f0106756fcbab8..6d4308be5b5e7208fc2c296d4708c671359fa9d8 100644 (file)
@@ -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);
 
 }