diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-06 13:16:48 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-06 17:19:29 +0300 |
commit | ac40cf76e5c03af2eca9d3076ec15578660ab245 (patch) | |
tree | af9af833724cfa702a49eca33914e392c4f98fc8 /source/blender/blenkernel | |
parent | 173c023197801b45e4c2332e7bc0bc2582c1cc48 (diff) |
Cleanup: use default ID type's name instead of generic 'Untitled' for new IDs.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_library.h | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index 34ea5505750..45a60453d2e 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -227,9 +227,6 @@ bool BKE_id_is_in_global_main(struct ID *id); void BKE_id_ordered_list(struct ListBase *ordered_lb, const struct ListBase *lb); void BKE_id_reorder(const struct ListBase *lb, struct ID *id, struct ID *relative, bool after); -/* use when "" is given to BKE_id_new_name_validate() */ -#define ID_FALLBACK_NAME N_("Untitled") - #define IS_TAGGED(_id) ((_id) && (((ID *)_id)->tag & LIB_TAG_DOIT)) #ifdef __cplusplus diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index fa988c34683..3dfc6e4007a 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1595,8 +1595,8 @@ bool BKE_id_new_name_validate(ListBase *lb, ID *id, const char *tname) BLI_strncpy(name, tname, sizeof(name)); if (name[0] == '\0') { - /* disallow empty names */ - BLI_strncpy(name, DATA_(ID_FALLBACK_NAME), sizeof(name)); + /* Disallow empty names. */ + BLI_strncpy(name, DATA_(BKE_idcode_to_name(GS(id->name))), sizeof(name)); } else { /* disallow non utf8 chars, |