diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2021-06-01 16:07:46 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-06-01 16:07:46 +0300 |
| commit | aa75e383ba46f0e906101bbb3492eff337c267ae (patch) | |
| tree | ce89d6a394431a36770de9bb4421a41962862194 /source/blender/blenkernel/BKE_lib_id.h | |
| parent | ee54a8ace753a56236f5d1d647da7a40904af6b3 (diff) | |
| parent | 6899dcab5339d1f17dd2ea665a38e4ab28ab23fc (diff) | |
Merge branch 'master' into tmp-buildbot-cleanuptmp-buildbot-cleanup
Diffstat (limited to 'source/blender/blenkernel/BKE_lib_id.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_lib_id.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_lib_id.h b/source/blender/blenkernel/BKE_lib_id.h index 7ac45ac4883..e16507bf3cc 100644 --- a/source/blender/blenkernel/BKE_lib_id.h +++ b/source/blender/blenkernel/BKE_lib_id.h @@ -258,8 +258,10 @@ void BKE_lib_id_swap_full(struct Main *bmain, struct ID *id_a, struct ID *id_b); void id_sort_by_name(struct ListBase *lb, struct ID *id, struct ID *id_sorting_hint); void BKE_lib_id_expand_local(struct Main *bmain, struct ID *id); -bool BKE_id_new_name_validate(struct ListBase *lb, struct ID *id, const char *name) - ATTR_NONNULL(1, 2); +bool BKE_id_new_name_validate(struct ListBase *lb, + struct ID *id, + const char *name, + const bool do_linked_data) ATTR_NONNULL(1, 2); void BKE_lib_id_clear_library_data(struct Main *bmain, struct ID *id); /* Affect whole Main database. */ |