diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-14 11:54:58 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-14 11:54:58 +0300 |
| commit | 48cd25a11aeca7e9d899130171a9d9848e89cf26 (patch) | |
| tree | e576a343c899570580ceac30761fe289091beb43 /source/blender/blenkernel/BKE_library.h | |
| parent | edad3076a91c72fb0bcaef651b9688d36999eec3 (diff) | |
| parent | 97f9f90986a045953c4f466bda2f76f52b41da35 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_library.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_library.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index f0ff719a619..cf9fee46e5f 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -65,7 +65,7 @@ struct ID *BKE_libblock_find_name(const short type, const char *name) ATTR_WARN_ /* library_remap.c (keep here since they're general functions) */ void BKE_libblock_free(struct Main *bmain, void *idv) ATTR_NONNULL(); -void BKE_libblock_free_datablock(struct ID *id) ATTR_NONNULL(); +void BKE_libblock_free_datablock(struct ID *id) ATTR_NONNULL(); void BKE_libblock_free_ex(struct Main *bmain, void *idv, const bool do_id_user, const bool do_ui_user) ATTR_NONNULL(); void BKE_libblock_free_us(struct Main *bmain, void *idv) ATTR_NONNULL(); void BKE_libblock_free_data(struct Main *bmain, struct ID *id, const bool do_id_user) ATTR_NONNULL(); |