Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2022-10-05 13:45:21 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2022-10-05 13:47:13 +0300
commitcfa765845b517a718f7c99d98b8f72f247a008be (patch)
treef0059f772b5f95b1f523054b89809f7cffc8ad86 /source/blender/editors
parent6d879601b76fddde010083b7e59705cfa2955c5e (diff)
Fix T101306: crash when calling Delete command for Library Override
Was not passing user_data to id_override_library_delete_hierarchy_fn. Also correct a wrong assert. Greenlit by @mont29 in T101306. Should also go into 3.3 LTS.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/space_outliner/outliner_tools.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tools.cc b/source/blender/editors/space_outliner/outliner_tools.cc
index 6679489af60..81e36fa6764 100644
--- a/source/blender/editors/space_outliner/outliner_tools.cc
+++ b/source/blender/editors/space_outliner/outliner_tools.cc
@@ -1229,7 +1229,7 @@ static void id_override_library_create_hierarchy(
/* Remove the instance empty from this scene, the items now have an overridden collection
* instead. */
if (success && data_idroot.is_override_instancing_object) {
- BLI_assert(GS(data_idroot.id_instance_hint) == ID_OB);
+ BLI_assert(GS(data_idroot.id_instance_hint->name) == ID_OB);
ED_object_base_free_and_unlink(
&bmain, scene, reinterpret_cast<Object *>(data_idroot.id_instance_hint));
}
@@ -1815,7 +1815,7 @@ static int outliner_liboverride_operation_exec(bContext *C, wmOperator *op)
space_outliner,
id_override_library_delete_hierarchy_fn,
OUTLINER_LIB_SELECTIONSET_SELECTED,
- nullptr);
+ &override_data);
id_override_library_delete_hierarchy_process(C, op->reports, override_data);