[Bf-blender-cvs] [ff1f1157065] master: Fix T51280: Alembic: Crash when removing cache modifier
Sybren A. Stüvel
noreply at git.blender.org
Wed Apr 26 15:21:54 CEST 2017
Commit: ff1f1157065034e5e7212beb2b9be8173da80dff
Author: Sybren A. Stüvel
Date: Wed Apr 26 13:01:19 2017 +0200
Branches: master
https://developer.blender.org/rBff1f1157065034e5e7212beb2b9be8173da80dff
Fix T51280: Alembic: Crash when removing cache modifier
The calls to id_us_plus/min were unnecessary (and caused assertion
failures) as this is already taken care of by transformcache_id_looper().
===================================================================
M source/blender/blenkernel/intern/constraint.c
===================================================================
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 58ad171ee20..c3b209f2333 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -4386,20 +4386,12 @@ static void transformcache_copy(bConstraint *con, bConstraint *srccon)
BLI_strncpy(dst->object_path, src->object_path, sizeof(dst->object_path));
dst->cache_file = src->cache_file;
-
- if (dst->cache_file) {
- id_us_plus(&dst->cache_file->id);
- }
}
static void transformcache_free(bConstraint *con)
{
bTransformCacheConstraint *data = con->data;
- if (data->cache_file) {
- id_us_min(&data->cache_file->id);
- }
-
if (data->reader) {
#ifdef WITH_ALEMBIC
CacheReader_free(data->reader);
More information about the Bf-blender-cvs
mailing list