Merge from trunk -r 24758:25003.
[blender.git] / source / blender / collada / DocumentImporter.cpp
index 381632523fa3d0e3b955d5d4022b0d3a4fc09c46..9ebcc8b191f76f960cd5dac9067cb748cc1ce99f 100644 (file)
@@ -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;