diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2018-04-02 23:12:08 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2018-04-02 23:25:22 +0300 |
commit | 89eb9c7f3e5184a6b5f4c4f91670683635160ea3 (patch) | |
tree | 9b0f79a9e241546fb9ae75440be608d13b5bce1b /source/blender/editors/object | |
parent | 1f291d5814c3797d44889f5fa681e5d8cb718cf5 (diff) |
Move to Collection: Use automatic fallback name for new collections popup
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_edit.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index c7aae4922e2..a80a738f08f 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -2222,12 +2222,19 @@ static int move_to_collection_invoke(bContext *C, wmOperator *op, const wmEvent prop = RNA_struct_find_property(op->ptr, "collection_index"); if (RNA_property_is_set(op->ptr, prop)) { + int collection_index = RNA_property_int_get(op->ptr, prop); RNA_boolean_set(op->ptr, "is_add", event->ctrl); if (RNA_boolean_get(op->ptr, "is_new")) { prop = RNA_struct_find_property(op->ptr, "new_collection_name"); if (!RNA_property_is_set(op->ptr, prop)) { - RNA_property_string_set(op->ptr, prop, "New Collection"); + char name[MAX_NAME]; + SceneCollection *scene_collection; + + scene_collection = BKE_collection_from_index(CTX_data_scene(C), collection_index); + BKE_collection_new_name_get(&CTX_data_scene(C)->id, scene_collection, name); + + RNA_property_string_set(op->ptr, prop, name); return WM_operator_props_dialog_popup(C, op, 10 * UI_UNIT_X, 5 * UI_UNIT_Y); } } |