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:
authorAlexander Gavrilov <angavrilov@gmail.com>2019-04-23 13:15:30 +0300
committerAlexander Gavrilov <angavrilov@gmail.com>2019-04-23 13:45:04 +0300
commitae054af14f995ef84e6368c25b49a306993b701b (patch)
tree8ac335188dcfb2699bcc088df272acc8795878d0 /source/blender/blenkernel/intern/armature.c
parent624e93bbef8a8a34be822c1a98df131439c32788 (diff)
Cleanup: rename the curveInX etc bbone DNA fields to curve_in_x etc.
Diffstat (limited to 'source/blender/blenkernel/intern/armature.c')
-rw-r--r--source/blender/blenkernel/intern/armature.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 3dd655ee9a8..531c1795497 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -686,11 +686,11 @@ void BKE_pchan_bbone_spline_params_get(struct bPoseChannel *pchan,
param->scale_out_y = bone->scale_out_y * (!rest ? pchan->scale_out_y : 1.0f);
/* Extra curve x / y */
- param->curveInX = bone->curveInX + (!rest ? pchan->curveInX : 0.0f);
- param->curveInY = bone->curveInY + (!rest ? pchan->curveInY : 0.0f);
+ param->curve_in_x = bone->curve_in_x + (!rest ? pchan->curve_in_x : 0.0f);
+ param->curve_in_y = bone->curve_in_y + (!rest ? pchan->curve_in_y : 0.0f);
- param->curveOutX = bone->curveOutX + (!rest ? pchan->curveOutX : 0.0f);
- param->curveOutY = bone->curveOutY + (!rest ? pchan->curveOutY : 0.0f);
+ param->curve_out_x = bone->curve_out_x + (!rest ? pchan->curve_out_x : 0.0f);
+ param->curve_out_y = bone->curve_out_y + (!rest ? pchan->curve_out_y : 0.0f);
}
}
@@ -816,11 +816,11 @@ void BKE_pchan_bbone_handles_compute(const BBoneSplineParameters *param,
const float xscale_correction = (param->do_scale) ? param->scale[0] : 1.0f;
const float yscale_correction = (param->do_scale) ? param->scale[2] : 1.0f;
- h1[0] += param->curveInX * xscale_correction;
- h1[2] += param->curveInY * yscale_correction;
+ h1[0] += param->curve_in_x * xscale_correction;
+ h1[2] += param->curve_in_y * yscale_correction;
- h2[0] += param->curveOutX * xscale_correction;
- h2[2] += param->curveOutY * yscale_correction;
+ h2[0] += param->curve_out_x * xscale_correction;
+ h2[2] += param->curve_out_y * yscale_correction;
}
}