diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-01-16 13:41:50 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-01-16 13:41:50 +0300 |
commit | 1d763b539517458d23a55406a926e86a73da146f (patch) | |
tree | 4fd4db210f15f4e1dd9d6a52c2c717a85f85ed11 /source/blender/depsgraph/intern/builder | |
parent | b974d0da4d10ccbec0b900c4c5f7abb51abb1101 (diff) |
Depsgraph: Check for ID match when checking if operations corresponds to the same bone
Diffstat (limited to 'source/blender/depsgraph/intern/builder')
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h | 4 |
1 files changed, 4 insertions, 0 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 d3f0f01772f..d53b1ee58e1 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h @@ -140,6 +140,10 @@ bool DepsgraphRelationBuilder::is_same_bone_dependency(const KeyFrom& key_from, if (op_from == NULL || op_to == NULL) { return false; } + /* Different armatures, bone can't be the same. */ + if (op_from->owner->owner != op_to->owner->owner) { + return false; + } /* We are only interested in relations like BONE_DONE -> BONE_LOCAL... */ if (!(op_from->opcode == DEG_OPCODE_BONE_DONE && op_to->opcode == DEG_OPCODE_BONE_LOCAL)) |