diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-12-02 06:32:31 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-02 06:37:04 +0300 |
commit | 55b31dd98ce592ef4e51a9f9edece9ade7c519db (patch) | |
tree | 290f5170ce123029d4b5eb3e801605daae7708bb /source/blender/editors | |
parent | 2e392a0fdc0975e500d7ea07bfbfc781f5ddd190 (diff) | |
parent | 335e1b507b1ad0e7c2bafb2175dac15d3d1add83 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/armature/armature_skinning.c | 2 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_armature.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_gizmo_armature.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/armature/armature_skinning.c b/source/blender/editors/armature/armature_skinning.c index 06385ab0cee..462c17e9008 100644 --- a/source/blender/editors/armature/armature_skinning.c +++ b/source/blender/editors/armature/armature_skinning.c @@ -326,7 +326,7 @@ static void add_verts_to_dgroups( if ((par->pose) && (pchan = BKE_pose_channel_find_name(par->pose, bone->name))) { if (bone->segments > 1) { segments = bone->segments; - b_bone_spline_setup(pchan, true, bbone_array); + BKE_pchan_bbone_spline_setup(pchan, true, bbone_array); bbone = bbone_array; } } diff --git a/source/blender/editors/gpencil/gpencil_armature.c b/source/blender/editors/gpencil/gpencil_armature.c index d69f64f3eaf..d62984020cd 100644 --- a/source/blender/editors/gpencil/gpencil_armature.c +++ b/source/blender/editors/gpencil/gpencil_armature.c @@ -323,7 +323,7 @@ static void gpencil_add_verts_to_dgroups( { if (bone->segments > 1) { segments = bone->segments; - b_bone_spline_setup(pchan, true, bbone_array); + BKE_pchan_bbone_spline_setup(pchan, true, bbone_array); bbone = bbone_array; } } diff --git a/source/blender/editors/space_view3d/view3d_gizmo_armature.c b/source/blender/editors/space_view3d/view3d_gizmo_armature.c index 4e91712491f..0a3d20979a0 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_armature.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_armature.c @@ -59,7 +59,7 @@ /* * TODO(campbell): Current conversion is a approximation (usable not correct), * we'll need to take the next/previous bones into account to get the tangent directions. - * First last matrices from 'b_bone_spline_setup' are close but also not quite accurate + * First last matrices from 'BKE_pchan_bbone_spline_setup' are close but also not quite accurate * since they're not at either end-points on the curve. * * Likely we'll need a function especially to get the first/last orientations. |