5 files changed, 13 insertions, 26 deletions
diff --git a/source/blender/editors/armature/armature_add.c b/source/blender/editors/armature/armature_add.c
index 6943d6bdc54..b5d7975a0c5 100644
--- a/source/blender/editors/armature/armature_add.c
+++ b/source/blender/editors/armature/armature_add.c
@@ -1136,8 +1136,7 @@ static int armature_subdivide_exec(bContext *C, wmOperator *op)
 
   /* loop over all editable bones */
   // XXX the old code did this in reverse order though!
-  CTX_DATA_BEGIN_WITH_ID(C, EditBone *, ebone, selected_editable_bones, bArmature *, arm)
-  {
+  CTX_DATA_BEGIN_WITH_ID (C, EditBone *, ebone, selected_editable_bones, bArmature *, arm) {
     for (i = cuts + 1; i > 1; i--) {
       /* compute cut ratio first */
       float cutratio = 1.0f / (float)i;
diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c
index dfcd0bf69f7..0e6a3eb5695 100644
--- a/source/blender/editors/armature/armature_edit.c
+++ b/source/blender/editors/armature/armature_edit.c
@@ -688,8 +688,7 @@ static int armature_fill_bones_exec(bContext *C, wmOperator *op)
 
   /* loop over all bones, and only consider if visible */
   bArmature *arm = NULL;
-  CTX_DATA_BEGIN_WITH_ID(C, EditBone *, ebone, visible_bones, bArmature *, arm_iter)
-  {
+  CTX_DATA_BEGIN_WITH_ID (C, EditBone *, ebone, visible_bones, bArmature *, arm_iter) {
     bool check = false;
     if (!(ebone->flag & BONE_CONNECTED) && (ebone->flag & BONE_ROOTSEL)) {
       fill_add_joint(ebone, 0, &points);
diff --git a/source/blender/editors/armature/pose_edit.c b/source/blender/editors/armature/pose_edit.c
index 599823a6401..9c31b66a3d1 100644
--- a/source/blender/editors/armature/pose_edit.c
+++ b/source/blender/editors/armature/pose_edit.c
@@ -601,8 +601,7 @@ static int pose_autoside_names_exec(bContext *C, wmOperator *op)
   Object *ob_prev = NULL;
 
   /* loop through selected bones, auto-naming them */
-  CTX_DATA_BEGIN_WITH_ID(C, bPoseChannel *, pchan, selected_pose_bones, Object *, ob)
-  {
+  CTX_DATA_BEGIN_WITH_ID (C, bPoseChannel *, pchan, selected_pose_bones, Object *, ob) {
     bArmature *arm = ob->data;
     BLI_strncpy(newname, pchan->name, sizeof(newname));
     if (bone_autoside_name(newname, 1, axis, pchan->bone->head[axis], pchan->bone->tail[axis])) {
@@ -659,8 +658,7 @@ static int pose_bone_rotmode_exec(bContext *C, wmOperator *op)
   Object *prev_ob = NULL;
 
   /* set rotation mode of selected bones  */
-  CTX_DATA_BEGIN_WITH_ID(C, bPoseChannel *, pchan, selected_pose_bones, Object *, ob)
-  {
+  CTX_DATA_BEGIN_WITH_ID (C, bPoseChannel *, pchan, selected_pose_bones, Object *, ob) {
     pchan->rotmode = mode;
 
     if (prev_ob != ob) {
@@ -887,8 +885,7 @@ static int pose_bone_layers_exec(bContext *C, wmOperator *op)
   Object *prev_ob = NULL;
 
   /* set layers of pchans based on the values set in the operator props */
-  CTX_DATA_BEGIN_WITH_ID(C, bPoseChannel *, pchan, selected_pose_bones, Object *, ob)
-  {
+  CTX_DATA_BEGIN_WITH_ID (C, bPoseChannel *, pchan, selected_pose_bones, Object *, ob) {
     /* get pointer for pchan, and write flags this way */
     RNA_pointer_create((ID *)ob->data, &RNA_Bone, pchan->bone, &ptr);
     RNA_boolean_set_array(&ptr, "layers", layers);
@@ -964,8 +961,7 @@ static int armature_bone_layers_exec(bContext *C, wmOperator *op)
   RNA_boolean_get_array(op->ptr, "layers", layers);
 
   /* set layers of pchans based on the values set in the operator props */
-  CTX_DATA_BEGIN_WITH_ID(C, EditBone *, ebone, selected_editable_bones, bArmature *, arm)
-  {
+  CTX_DATA_BEGIN_WITH_ID (C, EditBone *, ebone, selected_editable_bones, bArmature *, arm) {
     /* get pointer for pchan, and write flags this way */
     RNA_pointer_create((ID *)arm, &RNA_EditBone, ebone, &ptr);
     RNA_boolean_set_array(&ptr, "layers", layers);
diff --git a/source/blender/editors/armature/pose_select.c b/source/blender/editors/armature/pose_select.c
index b825d821fe8..d26eb7e904d 100644
--- a/source/blender/editors/armature/pose_select.c
+++ b/source/blender/editors/armature/pose_select.c
@@ -444,8 +444,7 @@ static int pose_de_select_all_exec(bContext *C, wmOperator *op)
   Object *ob_prev = NULL;
 
   /*  Set the flags */
-  CTX_DATA_BEGIN_WITH_ID(C, bPoseChannel *, pchan, visible_pose_bones, Object *, ob)
-  {
+  CTX_DATA_BEGIN_WITH_ID (C, bPoseChannel *, pchan, visible_pose_bones, Object *, ob) {
     bArmature *arm = ob->data;
     pose_do_bone_select(pchan, action);
 
@@ -741,8 +740,7 @@ static bool pose_select_same_group(bContext *C, bool extend)
   group_flags = NULL;
   ob_index = -1;
   ob_prev = NULL;
-  CTX_DATA_BEGIN_WITH_ID(C, bPoseChannel *, pchan, visible_pose_bones, Object, *ob)
-  {
+  CTX_DATA_BEGIN_WITH_ID (C, bPoseChannel *, pchan, visible_pose_bones, Object, *ob) {
     if (ob != ob_prev) {
       ob_index++;
       group_flags = group_flags_array + (ob_index * groups_len);
@@ -768,8 +766,7 @@ static bool pose_select_same_group(bContext *C, bool extend)
     ob_index = -1;
     ob_prev = NULL;
     /* only if group matches (and is not selected or current bone) */
-    CTX_DATA_BEGIN_WITH_ID(C, bPoseChannel *, pchan, visible_pose_bones, Object *, ob)
-    {
+    CTX_DATA_BEGIN_WITH_ID (C, bPoseChannel *, pchan, visible_pose_bones, Object *, ob) {
       if (ob != ob_prev) {
         ob_index++;
         group_flags = group_flags_array + (ob_index * groups_len);
@@ -824,8 +821,7 @@ static bool pose_select_same_layer(bContext *C, bool extend)
   layers = NULL;
   ob_prev = NULL;
   ob_index = -1;
-  CTX_DATA_BEGIN_WITH_ID(C, bPoseChannel *, pchan, visible_pose_bones, Object *, ob)
-  {
+  CTX_DATA_BEGIN_WITH_ID (C, bPoseChannel *, pchan, visible_pose_bones, Object *, ob) {
     if (ob != ob_prev) {
       layers = &layers_array[++ob_index];
       ob_prev = ob;
@@ -856,8 +852,7 @@ static bool pose_select_same_layer(bContext *C, bool extend)
   /* Select bones that are on same layers as layers flag. */
   ob_prev = NULL;
   ob_index = -1;
-  CTX_DATA_BEGIN_WITH_ID(C, bPoseChannel *, pchan, visible_pose_bones, Object *, ob)
-  {
+  CTX_DATA_BEGIN_WITH_ID (C, bPoseChannel *, pchan, visible_pose_bones, Object *, ob) {
     if (ob != ob_prev) {
       layers = &layers_array[++ob_index];
       ob_prev = ob;
diff --git a/source/blender/editors/armature/pose_utils.c b/source/blender/editors/armature/pose_utils.c
index d8793bc2a1e..844fce49d28 100644
--- a/source/blender/editors/armature/pose_utils.c
+++ b/source/blender/editors/armature/pose_utils.c
@@ -148,8 +148,7 @@ void poseAnim_mapping_get(bContext *C, ListBase *pfLinks)
 
   prev_ob = NULL;
   ob_pose_armature = NULL;
-  CTX_DATA_BEGIN_WITH_ID(C, bPoseChannel *, pchan, selected_pose_bones, Object *, ob)
-  {
+  CTX_DATA_BEGIN_WITH_ID (C, bPoseChannel *, pchan, selected_pose_bones, Object *, ob) {
     if (ob != prev_ob) {
       prev_ob = ob;
       ob_pose_armature = poseAnim_object_get(ob);
@@ -169,8 +168,7 @@ void poseAnim_mapping_get(bContext *C, ListBase *pfLinks)
   if (BLI_listbase_is_empty(pfLinks)) {
     prev_ob = NULL;
     ob_pose_armature = NULL;
-    CTX_DATA_BEGIN_WITH_ID(C, bPoseChannel *, pchan, visible_pose_bones, Object *, ob)
-    {
+    CTX_DATA_BEGIN_WITH_ID (C, bPoseChannel *, pchan, visible_pose_bones, Object *, ob) {
       if (ob != prev_ob) {
         prev_ob = ob;
         ob_pose_armature = poseAnim_object_get(ob);