Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / armature_update.c
index f5519966ac28f3087a6d9cf0dc26deedac7f9206..1460a3cb205f7b2a93ec1417f39111f180c62a24 100644 (file)
@@ -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);
 }