blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Cleanup: use memset instead of clearing individual runtime members

This commit is contained in:
Campbell Barton 2023-01-18 14:10:29 +11:00
parent 44dd3308a5
commit fd2bf32dc7
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/collection.c
View File

@ -209,10 +209,8 @@ static void collection_blend_write(BlendWriter *writer, ID *id, const void *id_a
/* Clean up, important in undo case to reduce false detection of changed data-blocks. */
collection->flag &= ~COLLECTION_HAS_OBJECT_CACHE;
collection->flag &= ~COLLECTION_HAS_OBJECT_CACHE_INSTANCED;
collection->runtime.tag = 0;
BLI_listbase_clear(&collection->runtime.object_cache);
BLI_listbase_clear(&collection->runtime.object_cache_instanced);
BLI_listbase_clear(&collection->runtime.parents);
memset(&collection->runtime, 0, sizeof(collection->runtime));
/* write LibData */
BLO_write_id_struct(writer, Collection, id_address, &collection->id);
@ -259,6 +257,8 @@ void BKE_collection_blend_read_data(BlendDataReader *reader, Collection *collect
}
collection->id.flag |= LIB_EMBEDDED_DATA;
}
memset(&collection->runtime, 0, sizeof(collection->runtime));
collection->runtime.owner_id = owner_id;
BLO_read_list(reader, &collection->gobject);
@ -269,10 +269,6 @@ void BKE_collection_blend_read_data(BlendDataReader *reader, Collection *collect
collection->flag &= ~COLLECTION_HAS_OBJECT_CACHE;
collection->flag &= ~COLLECTION_HAS_OBJECT_CACHE_INSTANCED;
collection->runtime.tag = 0;
BLI_listbase_clear(&collection->runtime.object_cache);
BLI_listbase_clear(&collection->runtime.object_cache_instanced);
BLI_listbase_clear(&collection->runtime.parents);
#ifdef USE_COLLECTION_COMPAT_28
/* This runs before the very first doversion. */