Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-12-28 09:17:25 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-12-28 09:21:29 +0300
commit641d4e2b7fc4fd563c3c2dd880c8c412dd35ce9a (patch)
tree6ec890d6f2aa558e1ada6cf6df94d121b9759134 /source/blender/makesrna/intern/rna_ID.c
parent12874c703cb4fe28600e2533309b3f855b226635 (diff)
Cleanup: use BLI_libblock prefix for id functions
- test_idbutton -> BLI_libblock_ensure_unique_name (not only used from UI) - BKE_rename_id -> BKE_libblock_rename (always pass valid main) also rename: - name_uiprefix_id -> BKE_id_uiprefix
Diffstat (limited to 'source/blender/makesrna/intern/rna_ID.c')
-rw-r--r--source/blender/makesrna/intern/rna_ID.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index 609e9d2f8db..3a163300264 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -93,6 +93,7 @@ EnumPropertyItem rna_enum_id_type_items[] = {
#include "BKE_animsys.h"
#include "BKE_material.h"
#include "BKE_depsgraph.h"
+#include "BKE_global.h" /* XXX, remove me */
#include "WM_api.h"
@@ -113,7 +114,7 @@ void rna_ID_name_set(PointerRNA *ptr, const char *value)
{
ID *id = (ID *)ptr->data;
BLI_strncpy_utf8(id->name + 2, value, sizeof(id->name) - 2);
- test_idbutton(id->name);
+ BLI_libblock_ensure_unique_name(G.main, id->name);
}
static int rna_ID_name_editable(PointerRNA *ptr)