diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-14 12:17:13 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-14 12:17:13 +0300 |
| commit | 6656af2d11cd70739b9423275729d7acb240e554 (patch) | |
| tree | 694fc7035e800f05e24a6fed28dc8c293dc247ea /source/blender/blenkernel/intern/library_remap.c | |
| parent | 48cd25a11aeca7e9d899130171a9d9848e89cf26 (diff) | |
| parent | 20e5052a72215fa432f7b74cd4b77a5fd8c8e7f1 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/library_remap.c')
| -rw-r--r-- | source/blender/blenkernel/intern/library_remap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c index a5e8e41e738..f855de0dac5 100644 --- a/source/blender/blenkernel/intern/library_remap.c +++ b/source/blender/blenkernel/intern/library_remap.c @@ -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); |