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

Fix T63276: crash deleting object with alembic constraint.

Browse Source
This commit is contained in:
Brecht Van Lommel
2019-04-04 15:07:37 +02:00
parent 3c6deb69f7
commit c81eca3d98
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/alembic/intern/abc_object.cc
View File

@@ -323,8 +323,13 @@ void AbcObjectReader::read_matrix(float r_mat[4][4], const float time,
* all parent matrices in the Alembic file, we assume that the Blender
* parent object is already updated for the current timekey, and use its
* world matrix. */
BLI_assert(m_object->parent);
mul_m4_m4m4(r_mat, m_object->parent->obmat, r_mat);
if (m_object->parent) {
mul_m4_m4m4(r_mat, m_object->parent->obmat, r_mat);
}
else {
/* This can happen if the user deleted the parent object. */
unit_m4(r_mat);
}
}
else {
/* Only apply scaling to root objects, parenting will propagate it. */

6
source/blender/blenkernel/intern/constraint.c
View File

@@ -4572,10 +4572,12 @@ static void transformcache_evaluate(bConstraint *con, bConstraintOb *cob, ListBa
const float frame = DEG_get_ctime(cob->depsgraph);
const float time = BKE_cachefile_time_offset(cache_file, frame, FPS);
BKE_cachefile_ensure_handle(G.main, cache_file);
/* Must always load ABC handle on original. */
CacheFile *cache_file_orig = (CacheFile *)DEG_get_original_id(&cache_file->id);
BKE_cachefile_ensure_handle(G.main, cache_file_orig);
if (!data->reader) {
data->reader = CacheReader_open_alembic_object(cache_file->handle,
data->reader = CacheReader_open_alembic_object(cache_file_orig->handle,
data->reader,
cob->ob,
data->object_path);