diff options
| author | YimingWu <xp8110@outlook.com> | 2020-11-15 06:07:21 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2020-11-15 06:07:21 +0300 |
| commit | 0c0686bd1af148b051c62f55efe3948f17cef8ae (patch) | |
| tree | e30a8be6840aa872c7610ac3fdde977fb135c45f /source/blender/depsgraph | |
| parent | 18702054552171d752dd4de52d2da75e6eb1db6b (diff) | |
| parent | 194a57fd631f755a1a443ff0ccd7c7d9c066d394 (diff) | |
Merge branch 'master' into lanpr-under-gp
# Conflicts:
# release/datafiles/locale
# release/scripts/addons
# source/blender/blenloader/intern/versioning_290.c
# source/blender/makesdna/DNA_gpencil_modifier_types.h
# source/tools
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc index 67a68f718fe..eb70760e556 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc @@ -118,6 +118,11 @@ void DepsgraphNodeBuilder::build_splineik_pose(Object *object, /* Find the chain's root. */ bPoseChannel *rootchan = BKE_armature_splineik_solver_find_root(pchan, data); + if (has_operation_node( + &object->id, NodeType::EVAL_POSE, rootchan->name, OperationCode::POSE_SPLINE_IK_SOLVER)) { + return; + } + /* Operation node for evaluating/running Spline IK Solver. * Store the "root bone" of this chain in the solver, so it knows where to * start. */ |