[Bf-blender-cvs] [883a20c] master: Cleanup: style

Campbell Barton noreply at git.blender.org
Tue Feb 2 02:48:17 CET 2016


Commit: 883a20c8e70a8294fa5e68aa26eac896ecaa7c20
Author: Campbell Barton
Date:   Tue Feb 2 11:56:30 2016 +1100
Branches: master
https://developer.blender.org/rB883a20c8e70a8294fa5e68aa26eac896ecaa7c20

Cleanup: style

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

M	source/blender/blenkernel/intern/image.c
M	source/blender/editors/armature/armature_select.c

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

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index f22cb02..05ec54e 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -1906,7 +1906,7 @@ static void stampdata_from_template(StampData *stamp_data,
 	else {
 		stamp_data->frame[0] = '\0';
 	}
-	if(scene->r.stamp & R_STAMP_CAMERA) {
+	if (scene->r.stamp & R_STAMP_CAMERA) {
 		BLI_snprintf(stamp_data->camera, sizeof(stamp_data->camera), "Camera %s", stamp_data_template->camera);
 	}
 	else {
@@ -1925,7 +1925,7 @@ static void stampdata_from_template(StampData *stamp_data,
 		stamp_data->scene[0] = '\0';
 	}
 	if (scene->r.stamp & R_STAMP_SEQSTRIP) {
-		BLI_snprintf(stamp_data->strip, sizeof(stamp_data->strip), "Strip %s" , stamp_data_template->strip);
+		BLI_snprintf(stamp_data->strip, sizeof(stamp_data->strip), "Strip %s", stamp_data_template->strip);
 	}
 	else {
 		stamp_data->strip[0] = '\0';
diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c
index f4771f6..5e4fc7a 100644
--- a/source/blender/editors/armature/armature_select.c
+++ b/source/blender/editors/armature/armature_select.c
@@ -863,10 +863,10 @@ static void select_similar_suffix(bArmature *arm, EditBone *ebone_act)
 
 static void is_ancestor(EditBone * bone, EditBone * ancestor)
 {
-	if(bone->temp.ebone == ancestor || bone->temp.ebone == NULL)
+	if (bone->temp.ebone == ancestor || bone->temp.ebone == NULL)
 		return;
 
-	if(bone->temp.ebone->temp.ebone != NULL && bone->temp.ebone->temp.ebone != ancestor)
+	if (bone->temp.ebone->temp.ebone != NULL && bone->temp.ebone->temp.ebone != ancestor)
 		is_ancestor(bone->temp.ebone, ancestor);
 
 	bone->temp.ebone = bone->temp.ebone->temp.ebone;
@@ -880,10 +880,10 @@ static void select_similar_children(bArmature *arm, EditBone *ebone_act)
 		ebone_iter->temp.ebone = ebone_iter->parent;
 	}
 
-	for (ebone_iter = arm->edbo->first; ebone_iter; ebone_iter = ebone_iter->next){
+	for (ebone_iter = arm->edbo->first; ebone_iter; ebone_iter = ebone_iter->next) {
 		is_ancestor(ebone_iter, ebone_act);
 
-		if(ebone_iter->temp.ebone == ebone_act && EBONE_SELECTABLE(arm, ebone_iter))
+		if (ebone_iter->temp.ebone == ebone_act && EBONE_SELECTABLE(arm, ebone_iter))
 			ED_armature_ebone_select_set(ebone_iter, true);
 	}
 }
@@ -892,7 +892,7 @@ static void select_similar_children_immediate(bArmature *arm, EditBone *ebone_ac
 {
 	EditBone *ebone_iter;
 	for (ebone_iter = arm->edbo->first; ebone_iter; ebone_iter = ebone_iter->next) {
-		if(ebone_iter->parent == ebone_act && EBONE_SELECTABLE(arm, ebone_iter)) {
+		if (ebone_iter->parent == ebone_act && EBONE_SELECTABLE(arm, ebone_iter)) {
 			ED_armature_ebone_select_set(ebone_iter, true);
 		}
 	}
@@ -902,11 +902,11 @@ static void select_similar_siblings(bArmature *arm, EditBone *ebone_act)
 {
 	EditBone *ebone_iter;
 
-	if(ebone_act->parent == NULL)
+	if (ebone_act->parent == NULL)
 		return;
 
 	for (ebone_iter = arm->edbo->first; ebone_iter; ebone_iter = ebone_iter->next) {
-		if(ebone_iter->parent == ebone_act->parent && EBONE_SELECTABLE(arm, ebone_iter)) {
+		if (ebone_iter->parent == ebone_act->parent && EBONE_SELECTABLE(arm, ebone_iter)) {
 			ED_armature_ebone_select_set(ebone_iter, true);
 		}
 	}




More information about the Bf-blender-cvs mailing list