Paths

Table of Contentst

Differential D15838

IDMAnagement: Add owner ID pointer to embedded ones.
ClosedPublic
Actions

Authored by Bastien Montagne (mont29) on Sep 1 2022, 5:45 PM.

Tags

None

Subscribers

None

Details

Reviewers

Brecht Van Lommel (brecht)

Commits

rBcd49fee74114: IDMAnagement: Add owner ID pointer to embedded ones.

Summary

Add a dedicated owner_id pointer to ID types that can be embedded
(Collections and NodeTrees), and modify slightly come code to make
handling those more safe and consistent.

This implements first part of T69169.

Diff Detail

Repository: rB Blender

Event Timeline

Bastien Montagne (mont29) requested review of this revision.Sep 1 2022, 5:45 PM

Bastien Montagne (mont29) created this revision.

Harbormaster completed remote builds in B23573: Diff 55198.Sep 1 2022, 5:45 PM

Brecht Van Lommel (brecht) accepted this revision.Sep 5 2022, 3:32 PM

Brecht Van Lommel (brecht) added inline comments.

source/blender/blenkernel/intern/collection.c
168	This `owner_id_hint` parameter can now be eliminated from `IDTypeEmbeddedOwnerGetFunction`?
source/blender/blenkernel/intern/node.cc
415–416	Personally I would not these kinds of slow loops in debug builds, but rather: BLI_assert(ntreeFromID(ntree->owner_id) == ntree)

This revision is now accepted and ready to land.Sep 5 2022, 3:32 PM

Updated from comments.

Harbormaster completed remote builds in B23615: Diff 55316.Sep 5 2022, 4:11 PM

Bastien Montagne (mont29) added inline comments.Sep 5 2022, 4:11 PM

source/blender/blenkernel/intern/collection.c
168	Indeed, but will do in a separate 'cleanup' commit.
source/blender/blenkernel/intern/node.cc
415–416	On second thought, agree this full check is overkill here, your proposed assert seems indeed enough here.

Brecht Van Lommel (brecht) accepted this revision.Sep 5 2022, 4:23 PM

Closed by commit rBcd49fee74114: IDMAnagement: Add owner ID pointer to embedded ones. (authored by Bastien Montagne (mont29)). · Explain WhySep 5 2022, 4:24 PM

This revision was automatically updated to reflect the committed changes.

Bastien Montagne (mont29) added a commit: rBcd49fee74114: IDMAnagement: Add owner ID pointer to embedded ones..

Bastien Montagne (mont29) mentioned this in T69169: Improve handling of embedded data-blocks (root nodetrees and master collections).Sep 7 2022, 9:58 AM

Revision Contents
Changeset List

Path

Size

source/

blender/

blenkernel/

BKE_collection.h

6 lines

9 lines

intern/

37 lines

4 lines

12 lines

64 lines

2 lines

3 lines

blenloader/

intern/

4 lines

versioning_280.c

4 lines

draw/

engines/

eevee/

eevee_shaders.c

12 lines

eevee_next/

eevee_material.cc

15 lines

editors/

space_node/

13 lines

freestyle/

intern/

blender_interface/

BlenderStrokeRenderer.cpp

6 lines

io/

collada/

2 lines

collada_utils.cpp

2 lines

usd/

intern/

usd_reader_material.cc

3 lines

wavefront_obj/

importer/

obj_import_mtl.cc

3 lines

makesdna/

DNA_collection_types.h

3 lines

DNA_node_types.h

3 lines

Diff 55317

source/blender/blenkernel/BKE_collection.h

Loading...

source/blender/blenkernel/BKE_node.h

Loading...

source/blender/blenkernel/intern/collection.c

Loading...

source/blender/blenkernel/intern/linestyle.c

Loading...

source/blender/blenkernel/intern/material.c

Loading...

source/blender/blenkernel/intern/node.cc

Loading...

source/blender/blenkernel/intern/scene.cc

Loading...

source/blender/blenkernel/intern/simulation.cc

Loading...

source/blender/blenloader/intern/readfile.c

Loading...

source/blender/blenloader/intern/versioning_280.c

Loading...

source/blender/draw/engines/eevee/eevee_shaders.c

Loading...

source/blender/draw/engines/eevee_next/eevee_material.cc

Loading...

source/blender/editors/space_node/node_edit.cc

Loading...

source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp

Loading...

source/blender/io/collada/Materials.cpp

Loading...

source/blender/io/collada/collada_utils.cpp

Loading...

source/blender/io/usd/intern/usd_reader_material.cc

Loading...

source/blender/io/wavefront_obj/importer/obj_import_mtl.cc

Loading...

source/blender/makesdna/DNA_collection_types.h

Loading...

source/blender/makesdna/DNA_node_types.h

Loading...