diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-22 02:59:32 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-22 02:59:32 +0300 |
commit | 257cf86a05517fd66d65f55c95fc28ec945804a8 (patch) | |
tree | c5285a39e47d56ef926a91be803685521ef6f2be /source/blender/depsgraph/intern/depsgraph.cc | |
parent | 04964ff1f4ef9ad23fa3e6cb0444bf28dd6813b5 (diff) | |
parent | 5d5c6bb5efee9bd03004845f9b1eee9d43883525 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph.cc')
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index 3b5ea2bfc3f..0ae5f44c3ed 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -161,16 +161,20 @@ static bool pointer_to_component_node_criteria( Object *object = (Object *)ptr->id.data; bConstraint *con = (bConstraint *)ptr->data; /* Check whether is object or bone constraint. */ + /* NOTE: Currently none of the area can address transform of an object + * at a given constraint, but for rigging one might use constraint + * influence to be used to drive some corrective shape keys or so. + */ if (BLI_findindex(&object->constraints, con) != -1) { - /* Constraint is defining object transform. */ *type = DEG_NODE_TYPE_TRANSFORM; + *operation_code = DEG_OPCODE_TRANSFORM_LOCAL; return true; } else if (object->pose != NULL) { LISTBASE_FOREACH(bPoseChannel *, pchan, &object->pose->chanbase) { if (BLI_findindex(&pchan->constraints, con) != -1) { - /* bone transforms */ *type = DEG_NODE_TYPE_BONE; + *operation_code = DEG_OPCODE_BONE_LOCAL; *subdata = pchan->name; return true; } |