[Bf-blender-cvs] [ae054af14f9] master: Cleanup: rename the curveInX etc bbone DNA fields to curve_in_x etc.
Alexander Gavrilov
noreply at git.blender.org
Tue Apr 23 12:45:18 CEST 2019
Commit: ae054af14f995ef84e6368c25b49a306993b701b
Author: Alexander Gavrilov
Date: Tue Apr 23 13:15:30 2019 +0300
Branches: master
https://developer.blender.org/rBae054af14f995ef84e6368c25b49a306993b701b
Cleanup: rename the curveInX etc bbone DNA fields to curve_in_x etc.
===================================================================
M source/blender/blenkernel/BKE_armature.h
M source/blender/blenkernel/intern/action.c
M source/blender/blenkernel/intern/armature.c
M source/blender/draw/intern/draw_armature.c
M source/blender/editors/armature/armature_add.c
M source/blender/editors/armature/armature_intern.h
M source/blender/editors/armature/armature_utils.c
M source/blender/editors/armature/pose_transform.c
M source/blender/editors/armature/pose_utils.c
M source/blender/editors/include/ED_armature.h
M source/blender/editors/space_view3d/view3d_gizmo_armature.c
M source/blender/makesdna/DNA_action_types.h
M source/blender/makesdna/DNA_armature_types.h
M source/blender/makesdna/intern/dna_rename_defs.h
M source/blender/makesrna/intern/rna_armature.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index 366fdc0ce45..267617e154f 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -208,7 +208,7 @@ typedef struct BBoneSplineParameters {
float ease1, ease2;
float roll1, roll2;
float scale_in_x, scale_in_y, scale_out_x, scale_out_y;
- float curveInX, curveInY, curveOutX, curveOutY;
+ float curve_in_x, curve_in_y, curve_out_x, curve_out_y;
} BBoneSplineParameters;
void BKE_pchan_bbone_handles_get(struct bPoseChannel *pchan,
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 59e279d8054..8e9158b8433 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -1408,8 +1408,8 @@ void BKE_pose_rest(bPose *pose)
pchan->size[0] = pchan->size[1] = pchan->size[2] = 1.0f;
pchan->roll1 = pchan->roll2 = 0.0f;
- pchan->curveInX = pchan->curveInY = 0.0f;
- pchan->curveOutX = pchan->curveOutY = 0.0f;
+ pchan->curve_in_x = pchan->curve_in_y = 0.0f;
+ pchan->curve_out_x = pchan->curve_out_y = 0.0f;
pchan->ease1 = pchan->ease2 = 0.0f;
pchan->scale_in_x = pchan->scale_in_y = 1.0f;
pchan->scale_out_x = pchan->scale_out_y = 1.0f;
@@ -1434,10 +1434,10 @@ void BKE_pose_copyesult_pchan_result(bPoseChannel *pchanto, const bPoseChannel *
pchanto->roll1 = pchanfrom->roll1;
pchanto->roll2 = pchanfrom->roll2;
- pchanto->curveInX = pchanfrom->curveInX;
- pchanto->curveInY = pchanfrom->curveInY;
- pchanto->curveOutX = pchanfrom->curveOutX;
- pchanto->curveOutY = pchanfrom->curveOutY;
+ pchanto->curve_in_x = pchanfrom->curve_in_x;
+ pchanto->curve_in_y = pchanfrom->curve_in_y;
+ pchanto->curve_out_x = pchanfrom->curve_out_x;
+ pchanto->curve_out_y = pchanfrom->curve_out_y;
pchanto->ease1 = pchanfrom->ease1;
pchanto->ease2 = pchanfrom->ease2;
pchanto->scale_in_x = pchanfrom->scale_in_x;
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;
}
}
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index bd2fa1d861d..7d1f0568e63 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -1116,11 +1116,11 @@ static void ebone_spline_preview(EditBone *ebone, float result_array[MAX_BBONE_S
param.scale_out_x = ebone->scale_out_x;
param.scale_out_y = ebone->scale_out_y;
- param.curveInX = ebone->curveInX;
- param.curveInY = ebone->curveInY;
+ param.curve_in_x = ebone->curve_in_x;
+ param.curve_in_y = ebone->curve_in_y;
- param.curveOutX = ebone->curveOutX;
- param.curveOutY = ebone->curveOutY;
+ param.curve_out_x = ebone->curve_out_x;
+ param.curve_out_y = ebone->curve_out_y;
ebone->segments = BKE_pchan_bbone_spline_compute(¶m, false, (Mat4 *)result_array);
}
diff --git a/source/blender/editors/armature/armature_add.c b/source/blender/editors/armature/armature_add.c
index 2e14595cf57..d02e58d48a9 100644
--- a/source/blender/editors/armature/armature_add.c
+++ b/source/blender/editors/armature/armature_add.c
@@ -79,10 +79,10 @@ EditBone *ED_armature_ebone_add(bArmature *arm, const char *name)
/* Bendy-Bone parameters */
bone->roll1 = 0.0f;
bone->roll2 = 0.0f;
- bone->curveInX = 0.0f;
- bone->curveInY = 0.0f;
- bone->curveOutX = 0.0f;
- bone->curveOutY = 0.0f;
+ bone->curve_in_x = 0.0f;
+ bone->curve_in_y = 0.0f;
+ bone->curve_out_x = 0.0f;
+ bone->curve_out_y = 0.0f;
bone->ease1 = 1.0f;
bone->ease2 = 1.0f;
bone->scale_in_x = 1.0f;
@@ -992,10 +992,10 @@ static int armature_extrude_exec(bContext *C, wmOperator *op)
/* Bendy-Bone parameters */
newbone->roll1 = ebone->roll1;
newbone->roll2 = ebone->roll2;
- newbone->curveInX = ebone->curveInX;
- newbone->curveInY = ebone->curveInY;
- newbone->curveOutX = ebone->curveOutX;
- newbone->curveOutY = ebone->curveOutY;
+ newbone->curve_in_x = ebone->curve_in_x;
+ newbone->curve_in_y = ebone->curve_in_y;
+ newbone->curve_out_x = ebone->curve_out_x;
+ newbone->curve_out_y = ebone->curve_out_y;
newbone->ease1 = ebone->ease1;
newbone->ease2 = ebone->ease2;
newbone->scale_in_x = ebone->scale_in_x;
diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h
index f5833e0d1e3..4aed4217b6d 100644
--- a/source/blender/editors/armature/armature_intern.h
+++ b/source/blender/editors/armature/armature_intern.h
@@ -162,8 +162,8 @@ typedef struct tPChanFCurveLink {
/** old bbone values (to be restored along with the transform properties) */
float roll1, roll2;
/** (NOTE: we haven't renamed these this time, as their names are already long enough) */
- float curveInX, curveInY;
- float curveOutX, curveOutY;
+ float curve_in_x, curve_in_y;
+ float curve_out_x, curve_out_y;
float ease1, ease2;
float scale_in_x, scale_in_y;
float scale_out_x, scale_out_y;
diff --git a/source/blender/editors/armature/armature_utils.c b/source/blender/editors/armature/armature_utils.c
index 29e90ea672f..fb3fb310b9d 100644
--- a/source/blender/editors/armature/armature_utils.c
+++ b/source/blender/editors/armature/armature_utils.c
@@ -390,7 +390,7 @@ void ED_armature_edit_transform_mirror_update(Object *obedit)
eboflip->tail[2] = ebo->tail[2];
eboflip->rad_tail = ebo->rad_tail;
eboflip->roll = -ebo->roll;
- eboflip->curveOutX = -ebo->curveOutX;
+ eboflip->curve_out_x = -ebo->curve_out_x;
eboflip->roll2 = -ebo->roll2;
/* Also move connected children, in case children's name aren't mirrored properly */
@@ -407,7 +407,7 @@ void ED_armature_edit_transform_mirror_update(Object *obedit)
eboflip->head[2] = ebo->head[2];
eboflip->rad_head = ebo->rad_head;
eboflip->roll = -ebo->roll;
- eboflip->curveInX = -ebo->curveInX;
+ eboflip->curve_in_x = -ebo->curve_in_x;
eboflip->roll1 = -ebo->roll1;
/* Also move connected parent, in case parent's name isn't mirrored properly */
@@ -423,8 +423,8 @@ void ED_armature_edit_transform_mirror_update(Object *obedit)
eboflip->xwidth = ebo->xwidth;
eboflip->zwidth = ebo->zwidth;
- eboflip->curveInX = -ebo->curveInX;
- eboflip->curveOutX = -ebo->curveOutX;
+ eboflip->curve_in_x = -ebo->curve_in_x;
+ eboflip->curve_out_x = -ebo->curve_out_x;
eboflip->roll1 = -ebo->roll1;
eboflip->roll2 = -ebo->roll2;
}
@@ -496,10 +496,10 @@ static EditBone *make_boneList_rec(ListBase *edbo,
/* Bendy-Bone parameters */
eBone->roll1 = curBone->roll1;
eBone->roll2 = curBone->roll2;
- eBone->curveInX = curBone->curveInX;
- eBone->curveInY = curBone->curveInY;
- eBone->curveOutX = curBone->curveOutX;
- eBone->curveOutY = curBone->curveOutY;
+ eBone->curve_in_x = curBone->curve_in_x;
+ eBone->curve_in_y = curBone->curve_in_y;
+ eBone->curve_out_x = curBone->curve_out_x;
+ eBone->curve_out_y = curBone->curve_out_y;
eBone->ease1 = curBone->ease1;
eBone->ease2 = curBone->ease2;
eBone->scale_in_x = curBone->scale_in_x;
@@ -708,10 +708,10 @@ void ED_armature_from_edit(Main *bmain, bArmature *arm)
/* Bendy-Bone parameters */
newBone->roll1 = eBone->roll1;
newBone->roll2 = eBone->roll2;
- newBone->curveInX = eBone->curveInX;
- newBone->curveInY = eBone->curveInY;
- newBone->curveOutX = eBone->curveOutX;
- newBone->curveOutY = eBone->curveOutY;
+ newBone->curve_in_x = eBone->curve_in_x;
+ newBone->curve_in_y = eBone->curve_in_y;
+ newBone->curve_out_x = eBone->curve_out_x;
+ newBone->curve_out_y = eBone->curve_out_y;
newBone->ease1 = eBone->ease1;
newBone->ease2 = eBone->ease2;
newBone->scale_in_x = eBone->scale_in_x;
diff --git a/source/blender/editors/armature/pose_transform.c b/source/blender/editors/armature/pose_transform.c
index 03984bfdbd8..6207d5412cf 100644
--- a/source/blender/editors/armature/pose_transform.c
+++ b/source/blender/editors/armature/pose_transform.c
@@ -162,10 +162,10 @@ static int apply_armature_pose2bones_exec(bContext *C, wmOperator *op)
*/
if (pchan->bone->segments > 1) {
/* combine rest/pose values */
- c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list