style cleanup: re - http://wiki.blender.org/index.php/Dev:Doc/CodeStyle#Braces_with_Macros

1 files changed, 38 insertions, 19 deletions

diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 751cd751224..35b3b0a0407 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -211,7 +211,8 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 	
-	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+	{
 		if (ob != obedit) {
 			ob->recalc |= OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME;
 			par = obedit->parent;
@@ -428,7 +429,8 @@ void ED_object_parent_clear(bContext *C, int type)
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 
-	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+	{
 		if (ob->parent == NULL)
 			continue;
 		
@@ -673,7 +675,8 @@ static int parent_set_exec(bContext *C, wmOperator *op)
 	int partype = RNA_enum_get(op->ptr, "type");
 	int ok = 1;
 
-	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+	{
 		if (!ED_object_parent_set(op->reports, bmain, scene, ob, par, partype)) {
 			ok = 0;
 			break;
@@ -754,7 +757,8 @@ static int parent_noinv_set_exec(bContext *C, wmOperator *op)
 	par->recalc |= OB_RECALC_OB;
 	
 	/* context iterator */
-	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+	{
 		if (ob != par) {
 			if (BKE_object_parent_loop_check(par, ob)) {
 				BKE_report(op->reports, RPT_ERROR, "Loop in parents");
@@ -805,7 +809,8 @@ static int object_slow_parent_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 
-	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+	{
 		if (ob->parent) {
 			if (ob->partype & PARSLOW) {
 				ob->partype -= PARSLOW;
@@ -847,7 +852,8 @@ static int object_slow_parent_set_exec(bContext *C, wmOperator *UNUSED(op))
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 
-	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+	{
 		if (ob->parent)
 			ob->partype |= PARSLOW;
 
@@ -898,7 +904,8 @@ static int object_track_clear_exec(bContext *C, wmOperator *op)
 		BKE_report(op->reports, RPT_ERROR, "Operation cannot be performed in EditMode");
 		return OPERATOR_CANCELLED;
 	}
-	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+	{
 		bConstraint *con, *pcon;
 		
 		/* remove track-object for old track */
@@ -964,7 +971,8 @@ static int track_set_exec(bContext *C, wmOperator *op)
 		bConstraint *con;
 		bDampTrackConstraint *data;
 
-		CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
+		CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+		{
 			if (ob != obact) {
 				con = add_ob_constraint(ob, "AutoTrack", CONSTRAINT_TYPE_DAMPTRACK);
 
@@ -983,7 +991,8 @@ static int track_set_exec(bContext *C, wmOperator *op)
 		bConstraint *con;
 		bTrackToConstraint *data;
 
-		CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
+		CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+		{
 			if (ob != obact) {
 				con = add_ob_constraint(ob, "AutoTrack", CONSTRAINT_TYPE_TRACKTO);
 
@@ -1004,7 +1013,8 @@ static int track_set_exec(bContext *C, wmOperator *op)
 		bConstraint *con;
 		bLockTrackConstraint *data;
 
-		CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
+		CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+		{
 			if (ob != obact) {
 				con = add_ob_constraint(ob, "AutoTrack", CONSTRAINT_TYPE_LOCKTRACK);
 
@@ -1058,7 +1068,8 @@ static unsigned int move_to_layer_init(bContext *C, wmOperator *op)
 
 	if (!RNA_struct_property_is_set(op->ptr, "layers")) {
 		/* note: layers are set in bases, library objects work for this */
-		CTX_DATA_BEGIN (C, Base *, base, selected_bases) {
+		CTX_DATA_BEGIN (C, Base *, base, selected_bases)
+		{
 			lay |= base->lay;
 		}
 		CTX_DATA_END;
@@ -1107,7 +1118,8 @@ static int move_to_layer_exec(bContext *C, wmOperator *op)
 	if (v3d && v3d->localvd) {
 		/* now we can move out of localview. */
 		/* note: layers are set in bases, library objects work for this */
-		CTX_DATA_BEGIN (C, Base *, base, selected_bases) {
+		CTX_DATA_BEGIN (C, Base *, base, selected_bases)
+		{
 			lay = base->lay & ~v3d->lay;
 			base->lay = lay;
 			base->object->lay = lay;
@@ -1120,7 +1132,8 @@ static int move_to_layer_exec(bContext *C, wmOperator *op)
 	else {
 		/* normal non localview operation */
 		/* note: layers are set in bases, library objects work for this */
-		CTX_DATA_BEGIN (C, Base *, base, selected_bases) {
+		CTX_DATA_BEGIN (C, Base *, base, selected_bases)
+		{
 			/* upper byte is used for local view */
 			local = base->lay & 0xFF000000;
 			base->lay = lay + local;
@@ -1202,7 +1215,8 @@ static int make_links_scene_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	CTX_DATA_BEGIN (C, Base *, base, selected_bases) {
+	CTX_DATA_BEGIN (C, Base *, base, selected_bases)
+	{
 		if (!object_in_scene(base->object, scene_to)) {
 			Base *nbase = MEM_mallocN(sizeof(Base), "newbase");
 			*nbase = *base;
@@ -1262,7 +1276,8 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
 
 	ob = ED_object_active_context(C);
 
-	CTX_DATA_BEGIN (C, Object *, obt, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object *, obt, selected_editable_objects)
+	{
 		if (ob != obt) {
 			if (allow_make_links_data(event, ob, obt)) {
 				switch (event) {
@@ -1725,21 +1740,24 @@ static int make_local_exec(bContext *C, wmOperator *op)
 
 	clear_id_newpoins();
 	
-	CTX_DATA_BEGIN (C, Object *, ob, selected_objects) {
+	CTX_DATA_BEGIN (C, Object *, ob, selected_objects)
+	{
 		if (ob->id.lib)
 			id_make_local(&ob->id, 0);
 	}
 	CTX_DATA_END;
 	
 	/* maybe object pointers */
-	CTX_DATA_BEGIN (C, Object *, ob, selected_objects) {
+	CTX_DATA_BEGIN (C, Object *, ob, selected_objects)
+	{
 		if (ob->id.lib == NULL) {
 			ID_NEW(ob->parent);
 		}
 	}
 	CTX_DATA_END;
 
-	CTX_DATA_BEGIN (C, Object *, ob, selected_objects) {
+	CTX_DATA_BEGIN (C, Object *, ob, selected_objects)
+	{
 		id = ob->data;
 			
 		if (id && mode > 1) {
@@ -1767,7 +1785,8 @@ static int make_local_exec(bContext *C, wmOperator *op)
 	CTX_DATA_END;
 
 	if (mode > 1) {
-		CTX_DATA_BEGIN (C, Object *, ob, selected_objects) {
+		CTX_DATA_BEGIN (C, Object *, ob, selected_objects)
+		{
 			if (ob->type == OB_LAMP) {
 				la = ob->data;