diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-25 02:31:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-25 02:31:37 +0300 |
| commit | 032129ef3527424de241f381376a3b94a2247965 (patch) | |
| tree | c767ec40502ab920ac823bba936c8b7f3cb8e75b /source/blender/blenkernel/BKE_library.h | |
| parent | ca088a7b126be3e08025b83d6ac6aafa7519985c (diff) | |
| parent | 9b32248894d133c6437174e1470dfefa23a10b87 (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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index 0abf99415c7..f3df8b9b363 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -51,9 +51,9 @@ struct PointerRNA; struct PropertyRNA; size_t BKE_libblock_get_alloc_info(short type, const char **name); -void *BKE_libblock_alloc_notest(short type); -void *BKE_libblock_alloc(struct Main *bmain, short type, const char *name, const int flag) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -void BKE_libblock_init_empty(struct ID *id); +void *BKE_libblock_alloc_notest(short type) ATTR_WARN_UNUSED_RESULT; +void *BKE_libblock_alloc(struct Main *bmain, short type, const char *name, const int flag) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); +void BKE_libblock_init_empty(struct ID *id) ATTR_NONNULL(1); /** * New ID creation/copying options. |