griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

BLO: Add a new API call to find IDs in newly read Main from a session_uuid.

Browse Source 
Needed for upcomming fix in Scene's undo_preserve code.
This commit is contained in:
Bastien Montagne
2023-06-21 15:10:13 +02:00
parent 6d1f34a15f
commit b5db6fe5d2
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/blenloader/BLO_read_write.h
View File

@@ -282,15 +282,29 @@ struct BlendFileReadReport *BLO_read_data_reports(BlendDataReader *reader);
* prevent linked data to point to local IDs.
* \return the new address of the given ID pointer, or null if not found.
*/
ID *BLO_read_get_new_id_address(BlendLibReader *reader,
struct ID *self_id,
const bool do_linked_only,
struct ID *id) ATTR_NONNULL(2);
struct ID *BLO_read_get_new_id_address(BlendLibReader *reader,
struct ID *self_id,
const bool do_linked_only,
struct ID *id) ATTR_NONNULL(2);
#define BLO_read_id_address(reader, self_id, id_ptr_p) \
*((void **)id_ptr_p) = (void *)BLO_read_get_new_id_address( \
(reader), (self_id), (self_id) && ID_IS_LINKED(self_id), (ID *)*(id_ptr_p))
/**
* Search for the new address of the ID for the given `session_uuid`.
*
* Only IDs existing in the newly read Main will be returned. If no matching `session_uuid` in new
* main can be found, `nullptr` is returned.
*
* This expected to be used during liblinking and/or 'undo_preserve' processes in undo case (i.e.
* memfile reading), typically to find a valid value (or nullptr) for ID pointers values comming
* from the previous, existing Main data, when it is preserved in newly read Main. See e.g. the
* #scene_undo_preserve codepath.
*/
struct ID *BLO_read_get_new_id_address_from_session_uuid(BlendLibReader *reader, uint session_uuid)
ATTR_NONNULL(1);
/* Misc. */
bool BLO_read_lib_is_undo(BlendLibReader *reader);

5
source/blender/blenloader/intern/readfile.cc
View File

@@ -4700,6 +4700,11 @@ ID *BLO_read_get_new_id_address(BlendLibReader *reader,
return static_cast<ID *>(newlibadr(reader->fd, self_id, is_linked_only, id));
}
ID *BLO_read_get_new_id_address_from_session_uuid(BlendLibReader *reader, uint session_uuid)
{
return BKE_main_idmap_lookup_uuid(reader->fd->new_idmap_uuid, session_uuid);
}
int BLO_read_fileversion_get(BlendDataReader *reader)
{
return reader->fd->fileversion;