Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / library_remap.c
index a5e8e41e738a2f99954b42dde0306beb4649e728..f855de0dac5f21cec0cd2142d9c06c6bbaa3e572 100644 (file)
@@ -751,7 +751,7 @@ void BKE_libblock_relink_to_newid(ID *id)
        BKE_library_foreach_ID_link(NULL, id, id_relink_to_newid_looper, NULL, 0);
 }
 
-void BKE_libblock_free_data(Main *UNUSED(bmain), ID *id, const bool do_id_user)
+void BKE_libblock_free_data(ID *id, const bool do_id_user)
 {
        if (id->properties) {
                IDP_FreeProperty_ex(id->properties, do_id_user);
@@ -916,7 +916,7 @@ void BKE_libblock_free_ex(Main *bmain, void *idv, const bool do_id_user, const b
 
        BLI_remlink(lb, id);
 
-       BKE_libblock_free_data(bmain, id, do_id_user);
+       BKE_libblock_free_data(id, do_id_user);
        BKE_main_unlock(bmain);
 
        MEM_freeN(id);