archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Alembic import: assign cache_file handle to original datablock

Browse Source
This commit is contained in:
Sybren A. Stüvel
2018-06-08 13:52:18 +02:00
parent c5904574cb
commit 0c7fc3a961
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/cachefile.c
View File

@@ -146,6 +146,9 @@ void BKE_cachefile_reload(const Main *bmain, CacheFile *cache_file)
void BKE_cachefile_ensure_handle(const Main *bmain, CacheFile *cache_file) void BKE_cachefile_ensure_handle(const Main *bmain, CacheFile *cache_file)
{ {
/* Assigning to a CoW copy is a bad idea; assign to the original instead. */
BLI_assert((cache_file->id.tag & LIB_TAG_COPIED_ON_WRITE) == 0);
BLI_spin_lock(&spin); BLI_spin_lock(&spin);
if (cache_file->handle_mutex == NULL) { if (cache_file->handle_mutex == NULL) {
cache_file->handle_mutex = BLI_mutex_alloc(); cache_file->handle_mutex = BLI_mutex_alloc();

2
source/blender/modifiers/intern/MOD_meshsequencecache.c
View File

@@ -103,7 +103,7 @@ static Mesh *applyModifier(
const float time = BKE_cachefile_time_offset(mcmd->cache_file, frame, FPS); const float time = BKE_cachefile_time_offset(mcmd->cache_file, frame, FPS);
const char *err_str = NULL; const char *err_str = NULL;
CacheFile *cache_file = mcmd->cache_file; CacheFile *cache_file = (CacheFile *)DEG_get_original_id(&mcmd->cache_file->id);
BKE_cachefile_ensure_handle(G.main, cache_file); BKE_cachefile_ensure_handle(G.main, cache_file);