diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-09-08 17:32:35 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-09-08 17:34:31 +0300 |
| commit | 406243c2fde7472ea39f1eb6316311aec5b72e13 (patch) | |
| tree | 2f14eea889d9ad6c8eebc0c40105e98148bf0d4c /source/blender/blenkernel/intern/key.c | |
| parent | 462014b59b4f5ad110ebfcbc17dfa1f896582110 (diff) | |
IDManagement: change `IDTypeInfo.owner_get` to instead return address of the owner_id pointer.
Also rename the callback. That way, we can keep moving toward a more
generic handling of those embedded IDs (think e.g. about copy code).
Diffstat (limited to 'source/blender/blenkernel/intern/key.c')
| -rw-r--r-- | source/blender/blenkernel/intern/key.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 8e7690d41d6..a4475869c2a 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -91,14 +91,14 @@ static void shapekey_foreach_id(ID *id, LibraryForeachIDData *data) BKE_LIB_FOREACHID_PROCESS_ID(data, key->from, IDWALK_CB_LOOPBACK); } -static ID *shapekey_owner_get(ID *id) +static ID **shapekey_owner_pointer_get(ID *id) { Key *key = (Key *)id; BLI_assert(key->from != NULL); BLI_assert(BKE_key_from_id(key->from) == key); - return key->from; + return &key->from; } static void shapekey_blend_write(BlendWriter *writer, ID *id, const void *id_address) @@ -215,7 +215,7 @@ IDTypeInfo IDType_ID_KE = { .foreach_path = NULL, /* A bit weird, due to shape-keys not being strictly speaking embedded data... But they also * share a lot with those (non linkable, only ever used by one owner ID, etc.). */ - .owner_get = shapekey_owner_get, + .owner_pointer_get = shapekey_owner_pointer_get, .blend_write = shapekey_blend_write, .blend_read_data = shapekey_blend_read_data, |