[Bf-blender-cvs] [4f97e33e906] master: Fix T66076: crash deleting imported Alembic object

Brecht Van Lommel noreply at git.blender.org
Mon Jun 24 14:48:52 CEST 2019


Commit: 4f97e33e906abc827f8b4af0c9b0fba845ef912f
Author: Brecht Van Lommel
Date:   Mon Jun 24 14:47:46 2019 +0200
Branches: master
https://developer.blender.org/rB4f97e33e906abc827f8b4af0c9b0fba845ef912f

Fix T66076: crash deleting imported Alembic object

===================================================================

M	source/blender/blenkernel/intern/cachefile.c

===================================================================

diff --git a/source/blender/blenkernel/intern/cachefile.c b/source/blender/blenkernel/intern/cachefile.c
index 44e951a43da..272413ece4a 100644
--- a/source/blender/blenkernel/intern/cachefile.c
+++ b/source/blender/blenkernel/intern/cachefile.c
@@ -100,7 +100,9 @@ void BKE_cachefile_reader_open(CacheFile *cache_file,
 void BKE_cachefile_reader_free(CacheFile *cache_file, struct CacheReader **reader)
 {
 #ifdef WITH_ALEMBIC
-  BLI_assert(cache_file->id.tag & LIB_TAG_COPIED_ON_WRITE);
+  if (cache_file) {
+    BLI_assert(cache_file->id.tag & LIB_TAG_COPIED_ON_WRITE);
+  }
 
   if (*reader != NULL) {
     CacheReader_free(*reader);
@@ -108,7 +110,7 @@ void BKE_cachefile_reader_free(CacheFile *cache_file, struct CacheReader **reade
 
     /* Multiple modifiers and constraints can call this function concurrently. */
     BLI_spin_lock(&spin);
-    if (cache_file->handle_readers) {
+    if (cache_file && cache_file->handle_readers) {
       BLI_gset_remove(cache_file->handle_readers, reader, NULL);
     }
     BLI_spin_unlock(&spin);



More information about the Bf-blender-cvs mailing list