Merge branch 'master' into blender2.8
This commit is contained in:
commit
48cd25a11a
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue