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

Fix (unreported) Scene Collection runtime data not cleared on write.

Browse Source
This commit is contained in:
Bastien Montagne
2023-11-23 15:06:21 +01:00
parent a1507baead
commit 8fc2b63468
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_collection.h
View File

@@ -312,6 +312,10 @@ bool BKE_collection_validate(struct Collection *collection);
/* .blend file I/O */
/** Perform some pre-writing cleanup on the COllection data itself (_not_ in any sub-data
* referenced by pointers). To be called before writing the Collection struct itself. */
void BKE_collection_blend_write_prepare_nolib(struct BlendWriter *writer,
struct Collection *collection);
void BKE_collection_blend_write_nolib(struct BlendWriter *writer, struct Collection *collection);
void BKE_collection_blend_read_data(struct BlendDataReader *reader,
struct Collection *collection,

11
source/blender/blenkernel/intern/collection.cc
View File

@@ -232,6 +232,13 @@ static ID **collection_owner_pointer_get(ID *id)
return &master_collection->owner_id;
}
void BKE_collection_blend_write_prepare_nolib(BlendWriter * /*writer*/, Collection *collection)
{
memset(&collection->runtime, 0, sizeof(collection->runtime));
/* Clean up, important in undo case to reduce false detection of changed data-blocks. */
collection->flag &= ~COLLECTION_FLAG_ALL_RUNTIME;
}
void BKE_collection_blend_write_nolib(BlendWriter *writer, Collection *collection)
{
BKE_id_blend_write(writer, &collection->id);
@@ -252,9 +259,7 @@ static void collection_blend_write(BlendWriter *writer, ID *id, const void *id_a
{
Collection *collection = (Collection *)id;
memset(&collection->runtime, 0, sizeof(collection->runtime));
/* Clean up, important in undo case to reduce false detection of changed data-blocks. */
collection->flag &= ~COLLECTION_FLAG_ALL_RUNTIME;
BKE_collection_blend_write_prepare_nolib(writer, collection);
/* write LibData */
BLO_write_id_struct(writer, Collection, id_address, &collection->id);

3
source/blender/blenkernel/intern/scene.cc
View File

@@ -1186,6 +1186,9 @@ static void scene_blend_write(BlendWriter *writer, ID *id, const void *id_addres
if (sce->master_collection) {
BLO_write_init_id_buffer_from_id(
temp_embedded_id_buffer, &sce->master_collection->id, BLO_write_is_undo(writer));
BKE_collection_blend_write_prepare_nolib(
writer,
reinterpret_cast<Collection *>(BLO_write_get_id_buffer_temp_id(temp_embedded_id_buffer)));
BLO_write_struct_at_address(writer,
Collection,
sce->master_collection,