diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-24 15:47:46 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-24 15:48:32 +0300 |
commit | 4f97e33e906abc827f8b4af0c9b0fba845ef912f (patch) | |
tree | d3319b8478999297a4c5a3aa47f35110db208a88 /source | |
parent | d6d36b98923bc360d338794ebc23e824b5a69380 (diff) |
Fix T66076: crash deleting imported Alembic object
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/cachefile.c | 6 |
1 files changed, 4 insertions, 2 deletions
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); |