Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-12-02 06:32:31 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-02 06:37:04 +0300
commit55b31dd98ce592ef4e51a9f9edece9ade7c519db (patch)
tree290f5170ce123029d4b5eb3e801605daae7708bb /source/blender/blenkernel/intern/armature_update.c
parent2e392a0fdc0975e500d7ea07bfbfc781f5ddd190 (diff)
parent335e1b507b1ad0e7c2bafb2175dac15d3d1add83 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/armature_update.c')
-rw-r--r--source/blender/blenkernel/intern/armature_update.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c
index f5519966ac2..1460a3cb205 100644
--- a/source/blender/blenkernel/intern/armature_update.c
+++ b/source/blender/blenkernel/intern/armature_update.c
@@ -728,10 +728,10 @@ void BKE_pose_eval_bbone_segments(struct Depsgraph *depsgraph,
bPoseChannel *pchan = pose_pchan_get_indexed(ob, pchan_index);
DEG_debug_print_eval(depsgraph, __func__, pchan->name, pchan);
if (pchan->bone != NULL && pchan->bone->segments > 1) {
- BKE_pchan_cache_bbone_segments(pchan);
+ BKE_pchan_bbone_segments_cache_compute(pchan);
bArmature *arm = (bArmature *)ob->data;
if (DEG_is_active(depsgraph) && arm->edbo == NULL) {
- BKE_pchan_copy_bbone_segments_cache(pchan->orig_pchan, pchan);
+ BKE_pchan_bbone_segments_cache_copy(pchan->orig_pchan, pchan);
}
}
}
@@ -857,5 +857,5 @@ void BKE_pose_eval_proxy_copy_bone(
BLI_assert(pchan != NULL);
BLI_assert(pchan_from != NULL);
BKE_pose_copyesult_pchan_result(pchan, pchan_from);
- BKE_pchan_copy_bbone_segments_cache(pchan, pchan_from);
+ BKE_pchan_bbone_segments_cache_copy(pchan, pchan_from);
}