diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-18 02:58:54 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-18 03:01:17 +0300 |
| commit | 27dff3fbc1e74aa6613d68a0d9f9b0096fc86f6e (patch) | |
| tree | 91c4fb3bbe944a4f9e0e6d72a25d12310872f849 /source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h | |
| parent | 8400b4b566350bd9d726a07627e74f5a995280da (diff) | |
| parent | e6df02861e17f75d4dd243776f35208681b78465 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h b/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h index d55f00ae7e4..485586e844f 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h @@ -213,7 +213,7 @@ bool DepsgraphRelationBuilder::is_same_shapekey_dependency( return false; } /* Check if this is actually a shape key datablock. */ - if (GS(op_from->owner->owner->id->name) != ID_KE) { + if (GS(op_from->owner->owner->id_orig->name) != ID_KE) { return false; } /* Different key data blocks. */ |