blender/blender
168
526
Fork 801
Code Issues 6.6k Pull Requests 962 Projects 21 Wiki Activity

Asset Browser: Add selected_ids to filebrowser context #104692

Closed
Angus Stanton wants to merge 8 commits from ab_stanton/blender:selected-ids into main
pull from: ab_stanton/blender:selected-ids
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 8 Files Changed 2 +25 -8
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/asset/intern/asset_ops.cc
View File

@ -50,19 +50,20 @@ static PointerRNAVec asset_operation_get_ids_from_context(const bContext *C)
{
PointerRNAVec ids;
ListBase ids_list;
/* First check if there is a selected_ids list to use. */
if (CTX_data_selected_ids(C, &ids_list)) {
LISTBASE_FOREACH (CollectionPointerLink *, link, &ids_list) {
ids.append(link->ptr);
}
BLI_freelistN(&ids_list);
return ids;
}
PointerRNA idptr = CTX_data_pointer_get_type(C, "id", &RNA_ID);
if (idptr.data) {
/* Single ID. */
ids.append(idptr);
}
else {
ListBase list;
CTX_data_selected_ids(C, &list);
LISTBASE_FOREACH (CollectionPointerLink *, link, &list) {
ids.append(link->ptr);
}
BLI_freelistN(&list);
}
return ids;
}

16
source/blender/editors/space_file/space_file.c
View File

@ -959,6 +959,22 @@ static int /*eContextResult*/ file_context(const bContext *C,
CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
return CTX_RESULT_OK;
}
if (CTX_data_equals(member, "selected_ids")) {
const int num_files_filtered = filelist_files_ensure(sfile->files);
for (int file_index = 0; file_index < num_files_filtered; file_index++) {
if (filelist_entry_is_selected(sfile->files, file_index)) {
FileDirEntry *entry = filelist_file(sfile->files, file_index);
ID *id = filelist_file_get_id(entry);
if (id == NULL) {
continue;
}
CTX_data_id_list_add(result, id);
}
}
CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
return CTX_RESULT_OK;
}
if (CTX_data_equals(member, "id")) {
const FileDirEntry *file = filelist_file(sfile->files, params->active_file);
if (file == NULL) {