blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Outliner: tweak handling of liboverrides in delete code. 

Essentially, we only allow deletion of hierarchy roots of liboverrides,
when hierarchy deletion option is enabled.

Also add some checking code in the generic, non-object/collection ID
delete code, to prevent any deletion of liboverrides that would be part
of a hierarchy.
This commit is contained in:
Bastien Montagne 2022-03-24 11:59:41 +01:00
parent 24c30e001f
commit 4a674d08dd
3 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_outliner/outliner_collections.cc
View File

@ -301,7 +301,7 @@ static TreeTraversalAction collection_find_data_to_edit(TreeElement *te, void *c
if (ID_IS_OVERRIDE_LIBRARY_REAL(collection)) {
if (ID_IS_OVERRIDE_LIBRARY_HIERARCHY_ROOT(collection)) {
if (!data->is_liboverride_hierarchy_root_allowed) {
if (!(data->is_liboverride_hierarchy_root_allowed || data->is_liboverride_allowed)) {
return TRAVERSE_SKIP_CHILDS;
}
}

11
source/blender/editors/space_outliner/outliner_edit.cc
View File

@ -447,6 +447,17 @@ static void id_delete(bContext *C, ReportList *reports, TreeElement *te, TreeSto
(tselem->type == TSE_LAYER_COLLECTION));
UNUSED_VARS_NDEBUG(te);
if (ID_IS_OVERRIDE_LIBRARY(id)) {
if (!ID_IS_OVERRIDE_LIBRARY_REAL(id) ||
(id->override_library->flag & IDOVERRIDE_LIBRARY_FLAG_NO_HIERARCHY) == 0) {
BKE_reportf(reports,
RPT_WARNING,
"Cannot delete library override id '%s', it is part of an override hierarchy",
id->name);
return;
}
}
if (te->idcode == ID_LI && ((Library *)id)->parent != nullptr) {
BKE_reportf(reports, RPT_WARNING, "Cannot delete indirectly linked library '%s'", id->name);
return;

35
source/blender/editors/space_outliner/outliner_tools.cc
View File

@ -1677,6 +1677,12 @@ void OUTLINER_OT_object_operation(wmOperatorType *ot)
using OutlinerDeleteFn = void (*)(bContext *C, ReportList *reports, Scene *scene, Object *ob);
typedef struct ObjectEditData {
GSet *objects_set;
bool is_liboverride_allowed;
bool is_liboverride_hierarchy_root_allowed;
} ObjectEditData;
static void outliner_do_object_delete(bContext *C,
ReportList *reports,
Scene *scene,
@ -1693,7 +1699,8 @@ static void outliner_do_object_delete(bContext *C,
static TreeTraversalAction outliner_find_objects_to_delete(TreeElement *te, void *customdata)
{
GSet *objects_to_delete = (GSet *)customdata;
ObjectEditData *data = reinterpret_cast<ObjectEditData *>(customdata);
GSet *objects_to_delete = data->objects_set;
TreeStoreElem *tselem = TREESTORE(te);
if (outliner_is_collection_tree_element(te)) {
@ -1708,9 +1715,15 @@ static TreeTraversalAction outliner_find_objects_to_delete(TreeElement *te, void
ID *id = tselem->id;
if (ID_IS_OVERRIDE_LIBRARY_REAL(id)) {
if (!ID_IS_OVERRIDE_LIBRARY_HIERARCHY_ROOT(id)) {
/* Only allow deletion of liboverride objects if they are root overrides. */
return TRAVERSE_SKIP_CHILDS;
if (ID_IS_OVERRIDE_LIBRARY_HIERARCHY_ROOT(id)) {
if (!(data->is_liboverride_hierarchy_root_allowed || data->is_liboverride_allowed)) {
return TRAVERSE_SKIP_CHILDS;
}
}
else {
if (!data->is_liboverride_allowed) {
return TRAVERSE_SKIP_CHILDS;
}
}
}
@ -1732,27 +1745,31 @@ static int outliner_delete_exec(bContext *C, wmOperator *op)
/* Get selected objects skipping duplicates to prevent deleting objects linked to multiple
* collections twice */
GSet *objects_to_delete = BLI_gset_ptr_new(__func__);
ObjectEditData object_delete_data = {};
object_delete_data.objects_set = BLI_gset_ptr_new(__func__);
object_delete_data.is_liboverride_allowed = false;
object_delete_data.is_liboverride_hierarchy_root_allowed = delete_hierarchy;
outliner_tree_traverse(space_outliner,
&space_outliner->tree,
0,
TSE_SELECTED,
outliner_find_objects_to_delete,
objects_to_delete);
&object_delete_data);
if (delete_hierarchy) {
BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, false);
outliner_do_object_delete(
C, op->reports, scene, objects_to_delete, object_batch_delete_hierarchy_fn);
C, op->reports, scene, object_delete_data.objects_set, object_batch_delete_hierarchy_fn);
BKE_id_multi_tagged_delete(bmain);
}
else {
outliner_do_object_delete(C, op->reports, scene, objects_to_delete, outliner_object_delete_fn);
outliner_do_object_delete(
C, op->reports, scene, object_delete_data.objects_set, outliner_object_delete_fn);
}
BLI_gset_free(objects_to_delete, nullptr);
BLI_gset_free(object_delete_data.objects_set, nullptr);
outliner_collection_delete(C, bmain, scene, op->reports, delete_hierarchy);