From 0c242ff72b15fd21d4d2d9af0e3382c9197d4ab5 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 6 Sep 2022 18:21:16 +0200 Subject: Cleanup: IDManagement: Simplify `owner_get` calllback of IDTypeInfo. Now that all embedded IDs have a loopback pointer to their owner, we do need anymore extra parameters for this accessor. --- source/blender/editors/space_outliner/outliner_collections.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/space_outliner') diff --git a/source/blender/editors/space_outliner/outliner_collections.cc b/source/blender/editors/space_outliner/outliner_collections.cc index b56c7548386..0ded4654c80 100644 --- a/source/blender/editors/space_outliner/outliner_collections.cc +++ b/source/blender/editors/space_outliner/outliner_collections.cc @@ -380,7 +380,7 @@ void outliner_collection_delete( const IDTypeInfo *id_type = BKE_idtype_get_info_from_id(&parent->id); BLI_assert(id_type->owner_get != nullptr); - ID *scene_owner = id_type->owner_get(bmain, &parent->id, nullptr); + ID *scene_owner = id_type->owner_get(&parent->id); BLI_assert(GS(scene_owner->name) == ID_SCE); if (ID_IS_LINKED(scene_owner) || ID_IS_OVERRIDE_LIBRARY(scene_owner)) { skip = true; @@ -613,7 +613,7 @@ static int collection_duplicate_exec(bContext *C, wmOperator *op) const IDTypeInfo *id_type = BKE_idtype_get_info_from_id(&parent->id); BLI_assert(id_type->owner_get != nullptr); - Scene *scene_owner = (Scene *)id_type->owner_get(bmain, &parent->id, nullptr); + Scene *scene_owner = (Scene *)id_type->owner_get(&parent->id); BLI_assert(scene_owner != nullptr); BLI_assert(GS(scene_owner->id.name) == ID_SCE); -- cgit v1.2.3