style cleanup: format 'for' loop macros the same as for loops, some renaming to BLI_array macros.

11 files changed, 90 insertions, 105 deletions

diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index ba527e6fa6a..082b6f6dc93 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -906,7 +906,7 @@ static int object_delete_exec(bContext *C, wmOperator *op)
 	if (CTX_data_edit_object(C)) 
 		return OPERATOR_CANCELLED;
 	
-	CTX_DATA_BEGIN(C, Base*, base, selected_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selected_bases) {
 
 		/* if (base->object->type==OB_LAMP) islamp= 1; */
 
@@ -972,7 +972,7 @@ static void copy_object_set_idnew(bContext *C, int dupflag)
 	int a;
 	
 	/* XXX check object pointers */
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object*, ob, selected_editable_objects) {
 		object_relink(ob);
 	}
 	CTX_DATA_END;
@@ -1189,7 +1189,7 @@ static int object_duplicates_make_real_exec(bContext *C, wmOperator *op)
 	
 	clear_id_newpoins();
 		
-	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selected_editable_bases) {
 		make_object_duplilist_real(C, scene, base, use_base_parent, use_hierarchy);
 
 		/* dependencies were changed */
@@ -1294,7 +1294,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 	/* don't forget multiple users! */
 
 	/* reset flags */
-	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selected_editable_bases) {
 		ob= base->object;
 		ob->flag &= ~OB_DONE;
 
@@ -1305,7 +1305,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 	}
 	CTX_DATA_END;
 
-	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selected_editable_bases) {
 		ob= base->object;
 
 		if (ob->flag & OB_DONE || !IS_TAGGED(ob->data)) {
@@ -1879,7 +1879,7 @@ static int duplicate_exec(bContext *C, wmOperator *op)
 	clear_id_newpoins();
 	clear_sca_new_poins();	/* sensor/contr/act */
 	
-	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selected_editable_bases) {
 		Base *basen= object_add_duplicate_internal(bmain, scene, base, dupflag);
 		
 		/* note that this is safe to do with this context iterator,
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index 8b22b4613b8..dffcaad42fd 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -922,7 +922,7 @@ static int multiresbake_check(bContext *C, wmOperator *op)
 	MultiresModifierData *mmd;
 	int ok= 1, a;
 
-	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selected_editable_bases) {
 		ob= base->object;
 
 		if (ob->type != OB_MESH) {
@@ -1079,7 +1079,7 @@ static int multiresbake_image_exec_locked(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 
 	if (scene->r.bake_flag&R_BAKE_CLEAR) {  /* clear images */
-		CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+		CTX_DATA_BEGIN (C, Base*, base, selected_editable_bases) {
 			Mesh *me;
 
 			ob= base->object;
@@ -1090,7 +1090,7 @@ static int multiresbake_image_exec_locked(bContext *C, wmOperator *op)
 		CTX_DATA_END;
 	}
 
-	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selected_editable_bases) {
 		MultiresBakeRender bkr= {0};
 
 		ob= base->object;
@@ -1139,7 +1139,7 @@ static void init_multiresbake_job(bContext *C, MultiresBakeJob *bkj)
 	bkj->use_lores_mesh= scene->r.bake_flag&R_BAKE_LORES_MESH;
 	bkj->bake_clear= scene->r.bake_flag&R_BAKE_CLEAR;
 
-	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selected_editable_bases) {
 		MultiresBakerJobData *data;
 		DerivedMesh *lores_dm;
 		int lvl;
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index ec3567454df..158d323b802 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -1150,8 +1150,7 @@ static int pose_constraints_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	Object *ob= object_pose_armature_get(CTX_data_active_object(C));
 	
 	/* free constraints for all selected bones */
-	CTX_DATA_BEGIN(C, bPoseChannel*, pchan, selected_pose_bones)
-	{
+	CTX_DATA_BEGIN (C, bPoseChannel*, pchan, selected_pose_bones) {
 		free_constraints(&pchan->constraints);
 		pchan->constflag &= ~(PCHAN_HAS_IK|PCHAN_HAS_SPLINEIK|PCHAN_HAS_CONST);
 	}
@@ -1188,8 +1187,7 @@ static int object_constraints_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	Scene *scene= CTX_data_scene(C);
 	
 	/* do freeing */
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) 
-	{
+	CTX_DATA_BEGIN (C, Object*, ob, selected_editable_objects) {
 		free_constraints(&ob->constraints);
 		DAG_id_tag_update(&ob->id, OB_RECALC_OB);
 	}
@@ -1231,8 +1229,7 @@ static int pose_constraint_copy_exec(bContext *C, wmOperator *op)
 	}
 	
 	/* copy all constraints from active posebone to all selected posebones */
-	CTX_DATA_BEGIN(C, bPoseChannel*, chan, selected_pose_bones) 
-	{
+	CTX_DATA_BEGIN (C, bPoseChannel*, chan, selected_pose_bones) {
 		/* if we're not handling the object we're copying from, copy all constraints over */
 		if (pchan != chan) {
 			copy_constraints(&chan->constraints, &pchan->constraints, TRUE);
@@ -1272,8 +1269,7 @@ static int object_constraint_copy_exec(bContext *C, wmOperator *UNUSED(op))
 	Object *obact = ED_object_active_context(C);
 	
 	/* copy all constraints from active object to all selected objects */
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) 
-	{
+	CTX_DATA_BEGIN (C, Object*, ob, selected_editable_objects) {
 		/* if we're not handling the object we're copying from, copy all constraints over */
 		if (obact != ob) {
 			copy_constraints(&ob->constraints, &obact->constraints, TRUE);
@@ -1363,8 +1359,7 @@ static short get_new_constraint_target(bContext *C, int con_type, Object **tar_o
 	/* if the active Object is Armature, and we can search for bones, do so... */
 	if ((obact->type == OB_ARMATURE) && (only_ob == 0)) {
 		/* search in list of selected Pose-Channels for target */
-		CTX_DATA_BEGIN(C, bPoseChannel*, pchan, selected_pose_bones) 
-		{
+		CTX_DATA_BEGIN (C, bPoseChannel*, pchan, selected_pose_bones) {
 			/* just use the first one that we encounter, as long as it is not the active one */
 			if (pchan != pchanact) {
 				*tar_ob= obact;
@@ -1380,8 +1375,7 @@ static short get_new_constraint_target(bContext *C, int con_type, Object **tar_o
 	/* if not yet found, try selected Objects... */
 	if (found == 0) {
 		/* search in selected objects context */
-		CTX_DATA_BEGIN(C, Object*, ob, selected_objects) 
-		{
+		CTX_DATA_BEGIN (C, Object*, ob, selected_objects) {
 			/* just use the first object we encounter (that isn't the active object) 
 			 * and which fulfills the criteria for the object-target that we've got 
 			 */
@@ -1776,8 +1770,7 @@ static int pose_ik_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	Object *ob= object_pose_armature_get(CTX_data_active_object(C));
 	
 	/* only remove IK Constraints */
-	CTX_DATA_BEGIN(C, bPoseChannel*, pchan, selected_pose_bones) 
-	{
+	CTX_DATA_BEGIN (C, bPoseChannel*, pchan, selected_pose_bones) {
 		bConstraint *con, *next;
 		
 		// TODO: should we be checking if these contraints were local before we try and remove them?
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 69ced0c0f8a..3043900bce4 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -180,7 +180,7 @@ static int object_hide_view_set_exec(bContext *C, wmOperator *op)
 	short changed = 0;
 	const int unselected= RNA_boolean_get(op->ptr, "unselected");
 	
-	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, visible_bases) {
 		if (!unselected) {
 			if (base->flag & SELECT) {
 				base->flag &= ~SELECT;
@@ -236,7 +236,7 @@ static int object_hide_render_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	short changed= 0;
 
 	/* XXX need a context loop to handle such cases */
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object*, ob, selected_editable_objects) {
 		if (ob->restrictflag & OB_RESTRICT_RENDER) {
 			ob->restrictflag &= ~OB_RESTRICT_RENDER;
 			changed= 1;
@@ -270,7 +270,7 @@ static int object_hide_render_set_exec(bContext *C, wmOperator *op)
 {
 	const int unselected= RNA_boolean_get(op->ptr, "unselected");
 
-	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, visible_bases) {
 		if (!unselected) {
 			if (base->flag & SELECT) {
 				base->object->restrictflag |= OB_RESTRICT_RENDER;
@@ -1108,8 +1108,7 @@ void ED_objects_recalculate_paths(bContext *C, Scene *scene)
 	ListBase targets = {NULL, NULL};
 	
 	/* loop over objects in scene */
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) 
-	{
+	CTX_DATA_BEGIN (C, Object*, ob, selected_editable_objects) {
 		/* set flag to force recalc, then grab the relevant bones to target */
 		ob->avs.recalc |= ANIMVIZ_RECALC_PATHS;
 		animviz_get_object_motionpaths(ob, &targets);
@@ -1129,7 +1128,7 @@ static int object_calculate_paths_exec (bContext *C, wmOperator *op)
 	Scene *scene= CTX_data_scene(C);
 	
 	/* set up path data for bones being calculated */
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects)  
+	CTX_DATA_BEGIN (C, Object*, ob, selected_editable_objects)  
 	{
 		/* verify makes sure that the selected bone has a bone with the appropriate settings */
 		animviz_verify_motionpaths(op->reports, scene, ob, NULL);
@@ -1167,7 +1166,7 @@ void OBJECT_OT_paths_calculate (wmOperatorType *ot)
 void ED_objects_clear_paths(bContext *C)
 {
 	/* loop over objects in scene */
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) 
+	CTX_DATA_BEGIN (C, Object*, ob, selected_editable_objects) 
 	{
 		if (ob->mpath) {
 			animviz_free_motionpath(ob->mpath);
@@ -1215,7 +1214,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
 	int clear= (strcmp(op->idname, "OBJECT_OT_shade_flat") == 0);
 	int done= 0;
 
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object*, ob, selected_editable_objects) {
 
 		if (ob->type==OB_MESH) {
 			mesh_set_smooth_flag(ob, !clear);
@@ -1632,7 +1631,7 @@ static int game_property_copy_exec(bContext *C, wmOperator *op)
 		prop = BLI_findlink(&ob->prop, propid-1);
 		
 		if (prop) {
-			CTX_DATA_BEGIN(C, Object*, ob_iter, selected_editable_objects) {
+			CTX_DATA_BEGIN (C, Object*, ob_iter, selected_editable_objects) {
 				if (ob != ob_iter)
 					set_ob_property(ob_iter, prop);
 			} CTX_DATA_END;
@@ -1640,7 +1639,7 @@ static int game_property_copy_exec(bContext *C, wmOperator *op)
 	}
 
 	else {
-		CTX_DATA_BEGIN(C, Object*, ob_iter, selected_editable_objects) {
+		CTX_DATA_BEGIN (C, Object*, ob_iter, selected_editable_objects) {
 			if (ob != ob_iter) {
 				if (type == COPY_PROPERTIES_REPLACE)
 					copy_properties(&ob_iter->prop, &ob->prop);
@@ -1679,7 +1678,7 @@ void OBJECT_OT_game_property_copy(wmOperatorType *ot)
 
 static int game_property_clear_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	CTX_DATA_BEGIN(C, Object*, ob_iter, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object*, ob_iter, selected_editable_objects) {
 		free_properties(&ob_iter->prop);
 	}
 	CTX_DATA_END;
@@ -1707,7 +1706,7 @@ static int logicbricks_copy_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Object *ob=ED_object_active_context(C);
 
-	CTX_DATA_BEGIN(C, Object*, ob_iter, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object*, ob_iter, selected_editable_objects) {
 		if (ob != ob_iter) {
 			/* first: free all logic */
 			free_sensors(&ob_iter->sensors);				
@@ -1763,7 +1762,7 @@ static int game_physics_copy_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Object *ob=ED_object_active_context(C);
 	
-	CTX_DATA_BEGIN(C, Object*, ob_iter, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object*, ob_iter, selected_editable_objects) {
 		if (ob != ob_iter) {
 			ob_iter->gameflag = ob->gameflag;
 			ob_iter->gameflag2 = ob->gameflag2;
diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c
index 3867b1e34cb..97367b2e340 100644
--- a/source/blender/editors/object/object_group.c
+++ b/source/blender/editors/object/object_group.c
@@ -75,7 +75,7 @@ static int objects_add_active_exec(bContext *C, wmOperator *op)
 	for (group= bmain->group.first; group; group=group->id.next) {
 		if (object_in_group(ob, group)) {
 			/* Assign groups to selected objects */
-			CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+			CTX_DATA_BEGIN (C, Base*, base, selected_editable_bases) {
 				if (base->object->dup_group != group)
 					add_to_group(group, base->object, scene, base);
 				else
@@ -127,7 +127,7 @@ static int objects_remove_active_exec(bContext *C, wmOperator *op)
 	for (group= bmain->group.first; group; group=group->id.next) {
 		if (object_in_group(ob, group)) {
 			/* Assign groups to selected objects */
-			CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+			CTX_DATA_BEGIN (C, Base*, base, selected_editable_bases) {
 				rem_from_group(group, base->object, scene, base);
 				ok = 1;
 			}
@@ -164,7 +164,7 @@ static int group_objects_remove_exec(bContext *C, wmOperator *UNUSED(op))
 	Scene *scene= CTX_data_scene(C);
 	Group *group= NULL;
 
-	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selected_editable_bases) {
 		group = NULL;
 		while ((group = find_group(base->object, group)))
 			rem_from_group(group, base->object, scene, base);
@@ -203,7 +203,7 @@ static int group_create_exec(bContext *C, wmOperator *op)
 	
 	group= add_group(name);
 		
-	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selected_editable_bases) {
 		add_to_group(group, base->object, scene, base);
 	}
 	CTX_DATA_END;
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index f4d8cd5ae11..495f0b40802 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -483,8 +483,7 @@ static int object_add_hook_selob_exec(bContext *C, wmOperator *op)
 	Object *obedit = CTX_data_edit_object(C);
 	Object *obsel=NULL;
 	
-	CTX_DATA_BEGIN(C, Object*, ob, selected_objects)
-	{
+	CTX_DATA_BEGIN (C, Object*, ob, selected_objects) {
 		if (ob != obedit) {
 			obsel = ob;
 			break;
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 445047ac321..6eb1ad3a13d 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -1119,7 +1119,7 @@ static int multires_reshape_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	CTX_DATA_BEGIN(C, Object*, selob, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object*, selob, selected_editable_objects) {
 		if (selob->type == OB_MESH && selob != ob) {
 			secondob= selob;
 			break;
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 40e852ebf7c..624d6e52926 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -211,7 +211,7 @@ 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,8 +428,7 @@ 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;
 		
@@ -674,8 +673,7 @@ 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;
@@ -756,7 +754,7 @@ 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");
@@ -807,7 +805,7 @@ 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;
@@ -849,7 +847,7 @@ 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;
 
@@ -900,7 +898,7 @@ 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 */
@@ -966,7 +964,7 @@ 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);
 
@@ -985,7 +983,7 @@ 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);
 
@@ -1006,7 +1004,7 @@ 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);
 
@@ -1060,7 +1058,7 @@ 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;
@@ -1109,7 +1107,7 @@ 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;
@@ -1122,7 +1120,7 @@ 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;
@@ -1204,8 +1202,7 @@ 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;
@@ -1265,7 +1262,7 @@ 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) {
@@ -1728,21 +1725,21 @@ 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) {
@@ -1770,7 +1767,7 @@ 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;
 
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index 388766f5fa3..386541c5262 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -144,13 +144,13 @@ static int object_select_by_type_exec(bContext *C, wmOperator *op)
 	extend= RNA_boolean_get(op->ptr, "extend");
 		
 	if (extend == 0) {
-		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+		CTX_DATA_BEGIN (C, Base*, base, visible_bases) {
 			ED_base_object_select(base, BA_DESELECT);
 		}
 		CTX_DATA_END;
 	}
 	
-	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, visible_bases) {
 		if (base->object->type==obtype) {
 			ED_base_object_select(base, BA_SELECT);
 		}
@@ -218,7 +218,7 @@ static int object_select_linked_exec(bContext *C, wmOperator *op)
 	extend= RNA_boolean_get(op->ptr, "extend");
 	
 	if (extend == 0) {
-		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+		CTX_DATA_BEGIN (C, Base*, base, visible_bases) {
 			ED_base_object_select(base, BA_DESELECT);
 		}
 		CTX_DATA_END;
@@ -263,7 +263,7 @@ static int object_select_linked_exec(bContext *C, wmOperator *op)
 	else
 		return OPERATOR_CANCELLED;
 	
-	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, visible_bases) {
 		if (nr==1) {
 				// XXX old animation system
 			//if (base->object->ipo==ipo) base->flag |= SELECT;
@@ -386,7 +386,7 @@ static short select_grouped_children(bContext *C, Object *ob, int recursive)
 {
 	short changed = 0;
 
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selectable_bases) {
 		if (ob == base->object->parent) {
 			if (!(base->flag & SELECT)) {
 				ED_base_object_select(base, BA_SELECT);
@@ -444,7 +444,7 @@ static short select_grouped_group(bContext *C, Object *ob)	/* Select objects in
 		return 0;
 	else if (group_count == 1) {
 		group = ob_groups[0];
-		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+		CTX_DATA_BEGIN (C, Base*, base, visible_bases) {
 			if (!(base->flag & SELECT) && object_in_group(base->object, group)) {
 				ED_base_object_select(base, BA_SELECT);
 				changed = 1;
@@ -498,7 +498,7 @@ static short select_grouped_siblings(bContext *C, Object *ob)
 {
 	short changed = 0;
 
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selectable_bases) {
 		if ((base->object->parent==ob->parent)  && !(base->flag & SELECT)) {
 			ED_base_object_select(base, BA_SELECT);
 			changed = 1;
@@ -512,7 +512,7 @@ static short select_grouped_type(bContext *C, Object *ob)
 {
 	short changed = 0;
 
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selectable_bases) {
 		if ((base->object->type == ob->type) && !(base->flag & SELECT)) {
 			ED_base_object_select(base, BA_SELECT);
 			changed = 1;
@@ -526,7 +526,7 @@ static short select_grouped_layer(bContext *C, Object *ob)
 {
 	char changed = 0;
 
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selectable_bases) {
 		if ((base->lay & ob->lay) && !(base->flag & SELECT)) {
 			ED_base_object_select(base, BA_SELECT);
 			changed = 1;
@@ -540,7 +540,7 @@ static short select_grouped_index_object(bContext *C, Object *ob)
 {
 	char changed = 0;
 
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selectable_bases) {
 		if ((base->object->index == ob->index) && !(base->flag & SELECT)) {
 			ED_base_object_select(base, BA_SELECT);
 			changed = 1;
@@ -554,7 +554,7 @@ static short select_grouped_color(bContext *C, Object *ob)
 {
 	char changed = 0;
 
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selectable_bases) {
 		if (!(base->flag & SELECT) && (compare_v3v3(base->object->col, ob->col, 0.005f))) {
 			ED_base_object_select(base, BA_SELECT);
 			changed = 1;
@@ -580,7 +580,7 @@ static short select_grouped_gameprops(bContext *C, Object *ob)
 {
 	char changed = 0;
 
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, selectable_bases) {
 		if (!(base->flag & SELECT) && (objects_share_gameprop(base->object, ob))) {
 			ED_base_object_select(base, BA_SELECT);
 			changed = 1;
@@ -602,8 +602,7 @@ static short select_grouped_keyingset(bContext *C, Object *UNUSED(ob))
 	/* select each object that Keying Set refers to */
 	// TODO: perhaps to be more in line with the rest of these, we should only take objects 
 	// if the passed in object is included in this too
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) 
-	{
+	CTX_DATA_BEGIN (C, Base*, base, selectable_bases) {
 		/* only check for this object if it isn't selected already, to limit time wasted */
 		if ((base->flag & SELECT) == 0) {
 			KS_Path *ksp;
@@ -636,7 +635,7 @@ static int object_select_grouped_exec(bContext *C, wmOperator *op)
 	extend= RNA_boolean_get(op->ptr, "extend");
 	
 	if (extend == 0) {
-		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+		CTX_DATA_BEGIN (C, Base*, base, visible_bases) {
 			ED_base_object_select(base, BA_DESELECT);
 			changed = 1;
 		}
@@ -701,13 +700,13 @@ static int object_select_by_layer_exec(bContext *C, wmOperator *op)
 	layernum = RNA_int_get(op->ptr, "layers");
 	
 	if (extend == 0) {
-		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+		CTX_DATA_BEGIN (C, Base*, base, visible_bases) {
 			ED_base_object_select(base, BA_DESELECT);
 		}
 		CTX_DATA_END;
 	}
 		
-	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, visible_bases) {
 		if (base->lay == (1<< (layernum -1)))
 			ED_base_object_select(base, BA_SELECT);
 	}
@@ -750,7 +749,7 @@ static int object_select_all_exec(bContext *C, wmOperator *op)
 
 	if (action == SEL_TOGGLE) {
 		action = SEL_SELECT;
-		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+		CTX_DATA_BEGIN (C, Base*, base, visible_bases) {
 			if (base->flag & SELECT) {
 				action = SEL_DESELECT;
 				break;
@@ -759,7 +758,7 @@ static int object_select_all_exec(bContext *C, wmOperator *op)
 		CTX_DATA_END;
 	}
 
-	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, visible_bases) {
 		switch (action) {
 		case SEL_SELECT:
 			ED_base_object_select(base, BA_SELECT);
@@ -822,7 +821,7 @@ static int object_select_same_group_exec(bContext *C, wmOperator *op)
 	if (!group)
 		return OPERATOR_PASS_THROUGH;
 
-	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, visible_bases) {
 		if (!(base->flag & SELECT) && object_in_group(base->object, group))
 			ED_base_object_select(base, BA_SELECT);
 	}
@@ -859,7 +858,7 @@ static int object_select_mirror_exec(bContext *C, wmOperator *op)
 	
 	extend= RNA_boolean_get(op->ptr, "extend");
 	
-	CTX_DATA_BEGIN(C, Base*, primbase, selected_bases) {
+	CTX_DATA_BEGIN (C, Base*, primbase, selected_bases) {
 		char tmpname[MAXBONENAME];
 
 		flip_side_name(tmpname, primbase->object->id.name+2, TRUE);
@@ -915,14 +914,14 @@ static int object_select_random_exec(bContext *C, wmOperator *op)
 	extend= RNA_boolean_get(op->ptr, "extend");
 	
 	if (extend == 0) {
-		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+		CTX_DATA_BEGIN (C, Base*, base, visible_bases) {
 			ED_base_object_select(base, BA_DESELECT);
 		}
 		CTX_DATA_END;
 	}
 	percent = RNA_float_get(op->ptr, "percent")/100.0f;
 		
-	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+	CTX_DATA_BEGIN (C, Base*, base, visible_bases) {
 		if (BLI_frand() < percent) {
 			ED_base_object_select(base, BA_SELECT);
 		}
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index 55954790687..d0fc4f79817 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -227,8 +227,7 @@ static int object_clear_transform_generic_exec(bContext *C, wmOperator *op,
 	/* operate on selected objects only if they aren't in weight-paint mode 
 	 * (so that object-transform clearing won't be applied at same time as bone-clearing)
 	 */
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) 
-	{
+	CTX_DATA_BEGIN (C, Object*, ob, selected_editable_objects) {
 		if (!(ob->mode & OB_MODE_WEIGHT_PAINT)) {
 			/* run provided clearing function */
 			clear_func(ob);
@@ -320,8 +319,7 @@ static int object_origin_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	float *v1, *v3;
 	float mat[3][3];
 
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) 
-	{
+	CTX_DATA_BEGIN (C, Object*, ob, selected_editable_objects) {
 		if (ob->parent) {
 			/* vectors pointed to by v1 and v3 will get modified */
 			v1= ob->loc;
@@ -385,7 +383,7 @@ static int apply_objects_internal(bContext *C, ReportList *reports, int apply_lo
 	int a, change = 0;
 	
 	/* first check if we can execute */
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object*, ob, selected_editable_objects) {
 
 		if (ob->type==OB_MESH) {
 			if (ID_REAL_USERS(ob->data) > 1) {
@@ -428,7 +426,7 @@ static int apply_objects_internal(bContext *C, ReportList *reports, int apply_lo
 	CTX_DATA_END;
 	
 	/* now execute */
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object*, ob, selected_editable_objects) {
 
 		/* calculate rotation/scale matrix */
 		if (apply_scale && apply_rot)
@@ -569,7 +567,7 @@ static int visual_transform_apply_exec(bContext *C, wmOperator *UNUSED(op))
 	Scene *scene= CTX_data_scene(C);
 	int change = 0;
 	
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object*, ob, selected_editable_objects) {
 		where_is_object(scene, ob);
 		object_apply_mat4(ob, ob->obmat, TRUE, TRUE);
 		where_is_object(scene, ob);
@@ -711,7 +709,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 	}
 
 	/* reset flags */
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object*, ob, selected_editable_objects) {
 			ob->flag &= ~OB_DONE;
 	}
 	CTX_DATA_END;
@@ -723,7 +721,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 			((ID *)tob->dup_group)->flag &= ~LIB_DOIT;
 	}
 
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+	CTX_DATA_BEGIN (C, Object*, ob, selected_editable_objects) {
 		if ((ob->flag & OB_DONE)==0) {
 			int do_inverse_offset = FALSE;
 			ob->flag |= OB_DONE;
@@ -896,11 +894,12 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 				ignore_parent_tx(bmain, scene, ob);
 				
 				/* other users? */
-				CTX_DATA_BEGIN(C, Object*, ob_other, selected_editable_objects) {
-					if (		(ob_other->flag & OB_DONE)==0 &&
-							(	(ob->data && (ob->data == ob_other->data)) ||
-								(ob->dup_group==ob_other->dup_group && (ob->transflag|ob_other->transflag) & OB_DUPLIGROUP) )
-					) {
+				CTX_DATA_BEGIN (C, Object*, ob_other, selected_editable_objects) {
+					if ((ob_other->flag & OB_DONE) == 0 &&
+					    ((ob->data && (ob->data == ob_other->data)) ||
+					     (ob->dup_group == ob_other->dup_group &&
+					      (ob->transflag | ob_other->transflag) & OB_DUPLIGROUP)))
+					{
 						ob_other->flag |= OB_DONE;
 						DAG_id_tag_update(&ob_other->id, OB_RECALC_OB|OB_RECALC_DATA);
 
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index e74819f10bf..1ddbc86a73f 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -2713,8 +2713,7 @@ static int vertex_group_copy_to_selected_exec(bContext *C, wmOperator *op)
 	int change= 0;
 	int fail= 0;
 
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects)
-	{
+	CTX_DATA_BEGIN (C, Object*, ob, selected_editable_objects) {
 		if (obact != ob) {
 			if (ED_vgroup_copy_array(ob, obact)) change++;
 			else                                fail++;