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

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-11-05 23:05:48 +11:00
parent 8bf245ad51 e071bf4690
commit e8fd1746ef
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/armature/bone_collections.cc
View File

@@ -855,7 +855,11 @@ static BoneCollection *add_or_move_to_collection_bcoll(wmOperator *op, bArmature
BoneCollection *target_bcoll;
PropertyRNA *prop = RNA_struct_find_property(op->ptr, "new_collection_name");
if (RNA_property_is_set(op->ptr, prop)) {
if (RNA_property_is_set(op->ptr, prop) ||
/* Neither properties can be used, the operator may have been called with defaults.
* In this case add a root collection, the default name will be used. */
(collection_index < 0))
{
/* TODO: check this with linked, non-overridden armatures. */
char new_collection_name[MAX_NAME];
RNA_string_get(op->ptr, "new_collection_name", new_collection_name);