Cleanup: rename the curveInX etc bbone DNA fields to curve_in_x etc.

5 files changed, 46 insertions, 46 deletions

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  */
-      curbone->curveInX += pchan_eval->curveInX;
-      curbone->curveInY += pchan_eval->curveInY;
-      curbone->curveOutX += pchan_eval->curveOutX;
-      curbone->curveOutY += pchan_eval->curveOutY;
+      curbone->curve_in_x += pchan_eval->curve_in_x;
+      curbone->curve_in_y += pchan_eval->curve_in_y;
+      curbone->curve_out_x += pchan_eval->curve_out_x;
+      curbone->curve_out_y += pchan_eval->curve_out_y;
       curbone->roll1 += pchan_eval->roll1;
       curbone->roll2 += pchan_eval->roll2;
       curbone->ease1 += pchan_eval->ease1;
@@ -176,8 +176,8 @@ static int apply_armature_pose2bones_exec(bContext *C, wmOperator *op)
       curbone->scale_out_y *= pchan_eval->scale_out_y;
 
       /* reset pose values */
-      pchan->curveInX = pchan->curveOutX = 0.0f;
-      pchan->curveInY = pchan->curveOutY = 0.0f;
+      pchan->curve_in_x = pchan->curve_out_x = 0.0f;
+      pchan->curve_in_y = pchan->curve_out_y = 0.0f;
       pchan->roll1 = pchan->roll2 = 0.0f;
       pchan->ease1 = pchan->ease2 = 0.0f;
       pchan->scale_in_x = pchan->scale_in_y = 1.0f;
@@ -400,10 +400,10 @@ static bPoseChannel *pose_bone_do_paste(Object *ob,
     }
 
     /* B-Bone posing options should also be included... */
-    pchan->curveInX = chan->curveInX;
-    pchan->curveInY = chan->curveInY;
-    pchan->curveOutX = chan->curveOutX;
-    pchan->curveOutY = chan->curveOutY;
+    pchan->curve_in_x = chan->curve_in_x;
+    pchan->curve_in_y = chan->curve_in_y;
+    pchan->curve_out_x = chan->curve_out_x;
+    pchan->curve_out_y = chan->curve_out_y;
 
     pchan->roll1 = chan->roll1;
     pchan->roll2 = chan->roll2;
@@ -418,8 +418,8 @@ static bPoseChannel *pose_bone_do_paste(Object *ob,
     if (flip) {
       pchan->loc[0] *= -1;
 
-      pchan->curveInX *= -1;
-      pchan->curveOutX *= -1;
+      pchan->curve_in_x *= -1;
+      pchan->curve_out_x *= -1;
       pchan->roll1 *= -1;  // XXX?
       pchan->roll2 *= -1;  // XXX?
 
@@ -798,10 +798,10 @@ static void pchan_clear_rot(bPoseChannel *pchan)
   pchan->roll1 = 0.0f;
   pchan->roll2 = 0.0f;
 
-  pchan->curveInX = 0.0f;
-  pchan->curveInY = 0.0f;
-  pchan->curveOutX = 0.0f;
-  pchan->curveOutY = 0.0f;
+  pchan->curve_in_x = 0.0f;
+  pchan->curve_in_y = 0.0f;
+  pchan->curve_out_x = 0.0f;
+  pchan->curve_out_y = 0.0f;
 }
 
 /* clear loc/rot/scale of pose-channel */
diff --git a/source/blender/editors/armature/pose_utils.c b/source/blender/editors/armature/pose_utils.c
index 4215c122917..45c51897cbf 100644
--- a/source/blender/editors/armature/pose_utils.c
+++ b/source/blender/editors/armature/pose_utils.c
@@ -115,10 +115,10 @@ static void fcurves_to_pchan_links_get(ListBase *pfLinks,
     /* store current bbone values */
     pfl->roll1 = pchan->roll1;
     pfl->roll2 = pchan->roll2;
-    pfl->curveInX = pchan->curveInX;
-    pfl->curveInY = pchan->curveInY;
-    pfl->curveOutX = pchan->curveOutX;
-    pfl->curveOutY = pchan->curveOutY;
+    pfl->curve_in_x = pchan->curve_in_x;
+    pfl->curve_in_y = pchan->curve_in_y;
+    pfl->curve_out_x = pchan->curve_out_x;
+    pfl->curve_out_y = pchan->curve_out_y;
     pfl->ease1 = pchan->ease1;
     pfl->ease2 = pchan->ease2;
     pfl->scale_in_x = pchan->scale_in_x;
@@ -261,10 +261,10 @@ void poseAnim_mapping_reset(ListBase *pfLinks)
     /* store current bbone values */
     pchan->roll1 = pfl->roll1;
     pchan->roll2 = pfl->roll2;
-    pchan->curveInX = pfl->curveInX;
-    pchan->curveInY = pfl->curveInY;
-    pchan->curveOutX = pfl->curveOutX;
-    pchan->curveOutY = pfl->curveOutY;
+    pchan->curve_in_x = pfl->curve_in_x;
+    pchan->curve_in_y = pfl->curve_in_y;
+    pchan->curve_out_x = pfl->curve_out_x;
+    pchan->curve_out_y = pfl->curve_out_y;
     pchan->ease1 = pfl->ease1;
     pchan->ease2 = pfl->ease2;
     pchan->scale_in_x = pfl->scale_in_x;