[Bf-blender-cvs] [1d763b53951] master: Depsgraph: Check for ID match when checking if operations corresponds to the same bone

[Sergey Sharybin]

Commit: 1d763b539517458d23a55406a926e86a73da146f
Author: Sergey Sharybin
Date:   Tue Jan 16 11:41:50 2018 +0100
Branches: master
https://developer.blender.org/rB1d763b539517458d23a55406a926e86a73da146f

Depsgraph: Check for ID match when checking if operations corresponds to the 
same bone

===================================================================

M       source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h

===================================================================

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))

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs