griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Collection name is clamped to 64 characters on creation

Browse Source 
Noticed while adding the `Move to Collection` menu #140883.
This follows #137608

Pull Request: https://projects.blender.org/blender/blender/pulls/141350
This commit is contained in:
Guillermo Venegas
2025-07-04 05:33:07 +02:00
committed by Pratik Borhade
parent a950d0b2b1
commit eb3c6c0505
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/collection.cc
View File

@@ -424,7 +424,7 @@ static Collection *collection_add(Main *bmain,
const char *name_custom)
{
/* Determine new collection name. */
char name[MAX_NAME];
char name[MAX_ID_NAME - 2];
if (name_custom) {
STRNCPY(name, name_custom);
@@ -818,7 +818,7 @@ void BKE_collection_new_name_get(Collection *collection_parent, char *rname)
name = BLI_sprintfN("%.*s %d", max_len, collection_parent->id.name + 2, number);
}
BLI_strncpy(rname, name, MAX_NAME);
BLI_strncpy(rname, name, MAX_ID_NAME - 2);
MEM_freeN(name);
}

8
source/blender/editors/object/object_edit.cc
View File

@@ -2212,7 +2212,7 @@ static wmOperatorStatus move_to_collection_exec(bContext *C, wmOperator *op)
ListBase objects = selected_objects_get(C);
if (is_new) {
char new_collection_name[MAX_NAME];
char new_collection_name[MAX_ID_NAME - 2];
RNA_string_get(op->ptr, "new_collection_name", new_collection_name);
collection = BKE_collection_add(bmain, collection, new_collection_name);
}
@@ -2322,7 +2322,7 @@ static wmOperatorStatus move_to_collection_invoke(bContext *C,
prop = RNA_struct_find_property(op->ptr, "new_collection_name");
if (!RNA_property_is_set(op->ptr, prop)) {
char name[MAX_NAME];
char name[MAX_ID_NAME - 2];
BKE_collection_new_name_get(collection, name);
@@ -2470,7 +2470,7 @@ void OBJECT_OT_move_to_collection(wmOperatorType *ot)
prop = RNA_def_string(ot->srna,
"new_collection_name",
nullptr,
MAX_NAME,
MAX_ID_NAME - 2,
"Name",
"Name of the newly added collection");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
@@ -2509,7 +2509,7 @@ void OBJECT_OT_link_to_collection(wmOperatorType *ot)
prop = RNA_def_string(ot->srna,
"new_collection_name",
nullptr,
MAX_NAME,
MAX_ID_NAME - 2,
"Name",
"Name of the newly added collection");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);