Cycles: svn merge -r41225:41232 ^/trunk/blender
[blender.git] / source / blender / blenkernel / intern / armature.c
index c1675fa..1149d8e 100644 (file)
@@ -141,7 +141,9 @@ void make_local_armature(bArmature *arm)
 
        if (arm->id.lib==NULL) return;
        if (arm->id.us==1) {
-               id_clear_lib_data(&bmain->armature, (ID *)arm);
+               arm->id.lib= NULL;
+               arm->id.flag= LIB_LOCAL;
+               new_id(&bmain->armature, (ID*)arm, NULL);
                return;
        }
 
@@ -153,7 +155,9 @@ void make_local_armature(bArmature *arm)
        }
 
        if(local && lib==0) {
-               id_clear_lib_data(&bmain->armature, (ID *)arm);
+               arm->id.lib= NULL;
+               arm->id.flag= LIB_LOCAL;
+               new_id(&bmain->armature, (ID *)arm, NULL);
        }
        else if(local && lib) {
                bArmature *armn= copy_armature(arm);