[Bf-blender-cvs] [25a9816c302] blender2.8: Cleanup: use bool

Campbell Barton noreply at git.blender.org
Mon Nov 5 03:23:13 CET 2018


Commit: 25a9816c3029e835db838388e0d3f6f4febce947
Author: Campbell Barton
Date:   Mon Nov 5 13:22:49 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB25a9816c3029e835db838388e0d3f6f4febce947

Cleanup: use bool

===================================================================

M	source/blender/blenkernel/BKE_armature.h
M	source/blender/blenkernel/intern/armature.c
M	source/blender/blenkernel/intern/constraint.c
M	source/blender/draw/intern/draw_armature.c
M	source/blender/editors/armature/armature_skinning.c
M	source/blender/editors/gpencil/gpencil_armature.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index b57630a348e..6937fdcac59 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -166,7 +166,7 @@ typedef struct BBoneSplineParameters {
 
 void BKE_pchan_get_bbone_handles(struct bPoseChannel *pchan, struct bPoseChannel **r_prev, struct bPoseChannel **r_next);
 
-void b_bone_spline_setup(struct bPoseChannel *pchan, int rest, Mat4 result_array[MAX_BBONE_SUBDIV]);
+void b_bone_spline_setup(struct bPoseChannel *pchan, const bool rest, Mat4 result_array[MAX_BBONE_SUBDIV]);
 
 int BKE_compute_b_bone_spline(struct BBoneSplineParameters *param, Mat4 result_array[MAX_BBONE_SUBDIV]);
 
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index be29819a0ee..fa5b59b739d 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -462,7 +462,7 @@ void BKE_pchan_get_bbone_handles(bPoseChannel *pchan, bPoseChannel **r_prev, bPo
 
 /* Fills the array with the desired amount of bone->segments elements.
  * This calculation is done within unit bone space. */
-void b_bone_spline_setup(bPoseChannel *pchan, int rest, Mat4 result_array[MAX_BBONE_SUBDIV])
+void b_bone_spline_setup(bPoseChannel *pchan, const bool rest, Mat4 result_array[MAX_BBONE_SUBDIV])
 {
 	bPoseChannel *next, *prev;
 	Bone *bone = pchan->bone;
@@ -821,8 +821,8 @@ static void pchan_b_bone_defmats(bPoseChannel *pchan, bPoseChanDeform *pdef_info
 	DualQuat *b_bone_dual_quats = NULL;
 	int a;
 
-	b_bone_spline_setup(pchan, 0, b_bone);
-	b_bone_spline_setup(pchan, 1, b_bone_rest);
+	b_bone_spline_setup(pchan, false, b_bone);
+	b_bone_spline_setup(pchan, true, b_bone_rest);
 
 	/* allocate b_bone matrices and dual quats */
 	b_bone_mats = MEM_mallocN((1 + bone->segments) * sizeof(Mat4), "BBone defmats");
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index f44f13ac4d5..2ba19b8c7de 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -595,7 +595,7 @@ static void constraint_target_to_mat4(Object *ob, const char *substring, float m
 				float loc[3], fac;
 
 				/* get bbone segments */
-				b_bone_spline_setup(pchan, 0, bbone);
+				b_bone_spline_setup(pchan, false, bbone);
 
 				/* figure out which segment(s) the headtail value falls in */
 				fac = (float)pchan->bone->segments * headtail;
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index 64b725b5d3f..40581093b28 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -1082,7 +1082,7 @@ static void draw_bone_update_disp_matrix_bbone(EditBone *eBone, bPoseChannel *pc
 	if (pchan) {
 		Mat4 *bbones_mat = (Mat4 *)pchan->draw_data->bbone_matrix;
 		if (bbone_segments > 1) {
-			b_bone_spline_setup(pchan, 0, bbones_mat);
+			b_bone_spline_setup(pchan, false, bbones_mat);
 
 			for (int i = bbone_segments; i--; bbones_mat++) {
 				mul_m4_m4m4(bbones_mat->mat, bbones_mat->mat, s);
diff --git a/source/blender/editors/armature/armature_skinning.c b/source/blender/editors/armature/armature_skinning.c
index 834be3b69ef..c68c2720b0b 100644
--- a/source/blender/editors/armature/armature_skinning.c
+++ b/source/blender/editors/armature/armature_skinning.c
@@ -325,7 +325,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, 1, bbone_array);
+						b_bone_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 34c5433e668..d69f64f3eaf 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, 1, bbone_array);
+					b_bone_spline_setup(pchan, true, bbone_array);
 					bbone = bbone_array;
 				}
 			}



More information about the Bf-blender-cvs mailing list