[Bf-blender-cvs] [bd46b40756c] lanpr-under-gp: LineArt: COLLECTION_HAS_OBJECT_CACHE_INSTANCED flag clear
YimingWu
noreply at git.blender.org
Sat Oct 31 09:48:59 CET 2020
Commit: bd46b40756c76026526106d092c691379c305e4a
Author: YimingWu
Date: Sat Oct 31 15:56:41 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBbd46b40756c76026526106d092c691379c305e4a
LineArt: COLLECTION_HAS_OBJECT_CACHE_INSTANCED flag clear
===================================================================
M source/blender/blenkernel/intern/collection.c
===================================================================
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 917e449ead6..6bef6a234d1 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -194,8 +194,10 @@ static void collection_blend_write(BlendWriter *writer, ID *id, const void *id_a
if (collection->id.us > 0 || BLO_write_is_undo(writer)) {
/* 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->tag = 0;
BLI_listbase_clear(&collection->object_cache);
+ BLI_listbase_clear(&collection->object_cache_instanced);
BLI_listbase_clear(&collection->parents);
/* write LibData */
@@ -227,8 +229,10 @@ void BKE_collection_blend_read_data(BlendDataReader *reader, Collection *collect
BKE_previewimg_blend_read(reader, collection->preview);
collection->flag &= ~COLLECTION_HAS_OBJECT_CACHE;
+ collection->flag &= ~COLLECTION_HAS_OBJECT_CACHE_INSTANCED;
collection->tag = 0;
BLI_listbase_clear(&collection->object_cache);
+ BLI_listbase_clear(&collection->object_cache_instanced);
BLI_listbase_clear(&collection->parents);
#ifdef USE_COLLECTION_COMPAT_28
More information about the Bf-blender-cvs
mailing list