Merge from trunk -r 24758:25003.

1 files changed, 2 insertions, 5 deletions

diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 381632523fa..9ebcc8b191f 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -100,9 +100,6 @@ extern "C"
 
 char *CustomData_get_layer_name(const struct CustomData *data, int type, int n);
 
-// armature module internal func, it's not good to use it here? (Arystan)
-struct EditBone *addEditBone(struct bArmature *arm, char *name);
-
 const char *primTypeToStr(COLLADAFW::MeshPrimitive::PrimitiveType type)
 {
 	using namespace COLLADAFW;
@@ -555,7 +552,7 @@ private:
 			}
 
 			DAG_scene_sort(CTX_data_scene(C));
-			ED_anim_dag_flush_update(C);
+			DAG_ids_flush_update(0);
 			WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
 		}
 
@@ -611,7 +608,7 @@ private:
 		}
 
 		// TODO rename from Node "name" attrs later
-		EditBone *bone = addEditBone(arm, (char*)get_joint_name(node));
+		EditBone *bone = ED_armature_edit_bone_add(arm, (char*)get_joint_name(node));
 		totbone++;
 
 		if (parent) bone->parent = parent;