diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-13 18:45:36 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-13 18:45:36 +0300 |
| commit | be4cf933abfef8c5e8ee02e04a236e414bc11287 (patch) | |
| tree | fc0cd6e768bef785778f52e88440d5782f34e144 /source/blender/blenkernel/BKE_library.h | |
| parent | 6ea6c516708abb1f82de7716de7f2a63646e82ee (diff) | |
| parent | f02e04f1338a84ed1a02734854c83244b9fd0002 (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index 863920c9c38..ef2fa5a1b65 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -50,6 +50,7 @@ struct bContext; 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) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); void BKE_libblock_init_empty(struct ID *id); |