[Bf-blender-cvs] [6e88e3e] master: Fix compile after last commit, casting to (bArmature *), kudos to JesterKing

[Jens Verwiebe]

Commit: 6e88e3eda49ecffa58c6cc3f3524a5594d754b4b
Author: Jens Verwiebe
Date:   Tue Dec 17 14:14:03 2013 +0100
http://developer.blender.org/rB6e88e3eda49ecffa58c6cc3f3524a5594d754b4b

Fix compile after last commit, casting to (bArmature *), kudos to JesterKing

===================================================================

M	source/blender/collada/ArmatureImporter.cpp

===================================================================

diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp
index ddc05b5..6d4308b 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);
 
 }