diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:07:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:12:28 +0300 |
| commit | 58dc114615449b8fc13e3b05ec3c21390547f5c7 (patch) | |
| tree | 1d0ff6108d39c3bbcc98e0443e3a437ec5a97399 /source/blender/blenkernel/BKE_library.h | |
| parent | d2ea1b2dcd536cc8a9e53bd830f0095f6bf9e2fe (diff) | |
| parent | 18d7fbe4f58c86f6f91b1e9e5c1f7f0c593a1d0f (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 eac4dc81582..f320597ef2d 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -151,7 +151,7 @@ void id_sort_by_name(struct ListBase *lb, struct ID *id); void BKE_id_expand_local(struct Main *bmain, struct ID *id); void BKE_id_copy_ensure_local(struct Main *bmain, const struct ID *old_id, struct ID *new_id); -bool new_id(struct ListBase *lb, struct ID *id, const char *name); +bool new_id(struct ListBase *lb, struct ID *id, const char *name) ATTR_NONNULL(1, 2); void id_clear_lib_data(struct Main *bmain, struct ID *id); void id_clear_lib_data_ex(struct Main *bmain, struct ID *id, const bool id_in_mainlist); |