style cleanup

12 files changed, 77 insertions, 71 deletions

diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index 48743c68ff5..ea3c8685525 100644
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -756,7 +756,7 @@ static int pose_visual_transform_apply_exec(bContext *C, wmOperator *UNUSED(op))
 	 *
 	 * TODO, loop over children before parents if multiple bones
 	 * at once are to be predictable*/
-	CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones)
+	CTX_DATA_BEGIN(C, bPoseChannel *, pchan, selected_pose_bones)
 	{
 		float delta_mat[4][4];
 		
@@ -923,7 +923,7 @@ int join_armature_exec(bContext *C, wmOperator *UNUSED(op))
 	pose = ob->pose;
 	ob->mode &= ~OB_MODE_POSE;
 
-	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
+	CTX_DATA_BEGIN(C, Base *, base, selected_editable_bases)
 	{
 		if ((base->object->type == OB_ARMATURE) && (base->object != ob)) {
 			bArmature *curarm = base->object->data;
@@ -1195,7 +1195,7 @@ static int separate_armature_exec(bContext *C, wmOperator *UNUSED(op))
 	
 	/* 1) only edit-base selected */
 	// TODO: use context iterators for this?
-	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
+	CTX_DATA_BEGIN(C, Base *, base, visible_bases)
 	{
 		if (base->object == obedit) base->flag |= 1;
 		else base->flag &= ~1;
@@ -2848,7 +2848,7 @@ static int armature_fill_bones_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 
 	/* loop over all bones, and only consider if visible */
-	CTX_DATA_BEGIN (C, EditBone *, ebone, visible_bones)
+	CTX_DATA_BEGIN(C, EditBone *, ebone, visible_bones)
 	{
 		if (!(ebone->flag & BONE_CONNECTED) && (ebone->flag & BONE_ROOTSEL))
 			fill_add_joint(ebone, 0, &points);
@@ -3562,7 +3562,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 (C, EditBone *, ebone, selected_editable_bones)
+	CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones)
 	{
 		for (i = numcuts + 1; i > 1; i--) {
 			/* compute cut ratio first */
@@ -3851,7 +3851,7 @@ static int armature_parent_set_exec(bContext *C, wmOperator *op)
 		 */
 		
 		/* parent selected bones to the active one */
-		CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+		CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones)
 		{
 			if (ELEM(ebone, actbone, actmirb) == 0) {
 				if (ebone->flag & BONE_SELECTED) 
@@ -3877,7 +3877,7 @@ static int armature_parent_set_invoke(bContext *C, wmOperator *UNUSED(op), wmEve
 	uiLayout *layout = uiPupMenuLayout(pup);
 	int allchildbones = 0;
 	
-	CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+	CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones)
 	{
 		if (ebone != actbone) {
 			if (ebone->parent != actbone) allchildbones = 1;
@@ -3937,7 +3937,7 @@ static int armature_parent_clear_exec(bContext *C, wmOperator *op)
 	bArmature *arm = (bArmature *)ob->data;
 	int val = RNA_enum_get(op->ptr, "type");
 		
-	CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+	CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones)
 	{
 		editbone_clear_parent(ebone, val);
 	}
@@ -3974,7 +3974,7 @@ void ARMATURE_OT_parent_clear(wmOperatorType *ot)
 static int armature_select_inverse_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	/*	Set the flags */
-	CTX_DATA_BEGIN (C, EditBone *, ebone, visible_bones)
+	CTX_DATA_BEGIN(C, EditBone *, ebone, visible_bones)
 	{
 		/* ignore bone if selection can't change */
 		if ((ebone->flag & BONE_UNSELECTABLE) == 0) {
@@ -4017,7 +4017,7 @@ static int armature_de_select_all_exec(bContext *C, wmOperator *op)
 	}
 	
 	/*	Set the flags */
-	CTX_DATA_BEGIN (C, EditBone *, ebone, visible_bones)
+	CTX_DATA_BEGIN(C, EditBone *, ebone, visible_bones)
 	{
 		/* ignore bone if selection can't change */
 		if ((ebone->flag & BONE_UNSELECTABLE) == 0) {
@@ -4437,7 +4437,7 @@ static int armature_align_bones_exec(bContext *C, wmOperator *op)
 		 */
 		
 		/* align selected bones to the active one */
-		CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+		CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones)
 		{
 			if (ELEM(ebone, actbone, actmirb) == 0) {
 				if (ebone->flag & BONE_SELECTED)
@@ -4523,7 +4523,9 @@ int ED_do_pose_selectbuffer(Scene *scene, Base *base, unsigned int *buffer, shor
 		 * note, special exception for armature mode so we can do multi-select
 		 * we could check for multi-select explicitly but think its fine to
 		 * always give predictable behavior in weight paint mode - campbell */
-		if ((!extend && !deselect && !toggle)|| ((ob_act && (ob_act != ob) && (ob_act->mode & OB_MODE_WEIGHT_PAINT) == 0))) {
+		if ((!extend && !deselect && !toggle) ||
+		    ((ob_act && (ob_act != ob) && (ob_act->mode & OB_MODE_WEIGHT_PAINT) == 0)))
+		{
 			ED_pose_deselectall(ob, 0);
 			nearBone->flag |= (BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
 			arm->act_bone = nearBone;
@@ -5134,7 +5136,7 @@ static int pose_clear_transform_generic_exec(bContext *C, wmOperator *op,
 	}
 	
 	/* only clear relevant transforms for selected bones */
-	CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones)
+	CTX_DATA_BEGIN(C, bPoseChannel *, pchan, selected_pose_bones)
 	{
 		/* run provided clearing function */
 		clear_func(pchan);
@@ -5278,7 +5280,7 @@ static int pose_de_select_all_exec(bContext *C, wmOperator *op)
 	}
 	
 	/*	Set the flags */
-	CTX_DATA_BEGIN (C, bPoseChannel *, pchan, visible_pose_bones)
+	CTX_DATA_BEGIN(C, bPoseChannel *, pchan, visible_pose_bones)
 	{
 		/* select pchan only if selectable, but deselect works always */
 		switch (action) {
@@ -5674,7 +5676,7 @@ static int armature_flip_names_exec(bContext *C, wmOperator *UNUSED(op))
 	arm = ob->data;
 	
 	/* loop through selected bones, auto-naming them */
-	CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+	CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones)
 	{
 		flip_side_name(newname, ebone->name, TRUE); // 1 = do strip off number extensions
 		ED_armature_bone_rename(arm, ebone->name, newname);
@@ -5719,7 +5721,7 @@ static int armature_autoside_names_exec(bContext *C, wmOperator *op)
 	arm = ob->data;
 	
 	/* loop through selected bones, auto-naming them */
-	CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+	CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones)
 	{
 		BLI_strncpy(newname, ebone->name, sizeof(newname));
 		if (bone_autoside_name(newname, 1, axis, ebone->head[axis], ebone->tail[axis]))
@@ -5742,7 +5744,8 @@ void ARMATURE_OT_autoside_names(wmOperatorType *ot)
 		{0, "XAXIS", 0, "X-Axis", "Left/Right"},
 		{1, "YAXIS", 0, "Y-Axis", "Front/Back"},
 		{2, "ZAXIS", 0, "Z-Axis", "Top/Bottom"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	
 	/* identifiers */
 	ot->name = "AutoName by Axis";
diff --git a/source/blender/editors/curve/curve_ops.c b/source/blender/editors/curve/curve_ops.c
index d642ee57c57..27c40095348 100644
--- a/source/blender/editors/curve/curve_ops.c
+++ b/source/blender/editors/curve/curve_ops.c
@@ -141,14 +141,14 @@ void ED_operatormacros_curve(void)
 	wmOperatorTypeMacro *otmacro;
 
 	ot = WM_operatortype_append_macro("CURVE_OT_duplicate_move", "Add Duplicate", "Duplicate curve and move",
-	                                  OPTYPE_UNDO|OPTYPE_REGISTER);
+	                                  OPTYPE_UNDO | OPTYPE_REGISTER);
 	WM_operatortype_macro_define(ot, "CURVE_OT_duplicate");
 	otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
 	RNA_enum_set(otmacro->ptr, "proportional", 0);
 	RNA_boolean_set(otmacro->ptr, "mirror", FALSE);
 
 	ot = WM_operatortype_append_macro("CURVE_OT_extrude_move", "Extrude Curve and Move",
-	                                  "Extrude curve and move result", OPTYPE_UNDO|OPTYPE_REGISTER);
+	                                  "Extrude curve and move result", OPTYPE_UNDO | OPTYPE_REGISTER);
 	WM_operatortype_macro_define(ot, "CURVE_OT_extrude");
 	otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
 	RNA_enum_set(otmacro->ptr, "proportional", 0);
@@ -189,8 +189,8 @@ void ED_keymap_curve(wmKeyConfig *keyconf)
 	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", ENDKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", LINE_END);
 	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", LEFTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", PREV_CHAR);
 	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", RIGHTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", NEXT_CHAR);
-	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", LEFTARROWKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0)->ptr, "type", PREV_WORD);
-	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", RIGHTARROWKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0)->ptr, "type", NEXT_WORD);
+	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", LEFTARROWKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0)->ptr, "type", PREV_WORD);
+	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", RIGHTARROWKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0)->ptr, "type", NEXT_WORD);
 	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", UPARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", PREV_LINE);
 	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", DOWNARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", NEXT_LINE);
 	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", PAGEUPKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", PREV_PAGE);
@@ -224,9 +224,9 @@ void ED_keymap_curve(wmKeyConfig *keyconf)
 	WM_keymap_add_item(keymap, "CURVE_OT_vertex_add", LEFTMOUSE, KM_CLICK, KM_CTRL, 0);
 
 	kmi = WM_keymap_add_item(keymap, "CURVE_OT_select_all", AKEY, KM_PRESS, 0, 0);
-		RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
+	RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
 	kmi = WM_keymap_add_item(keymap, "CURVE_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
-		RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
+	RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
 
 	WM_keymap_add_item(keymap, "CURVE_OT_select_row", RKEY, KM_PRESS, KM_SHIFT, 0);
 	WM_keymap_add_item(keymap, "CURVE_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0);
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index b94d3653f60..2fa7b4b2126 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -3530,7 +3530,8 @@ void CURVE_OT_spline_type_set(wmOperatorType *ot)
 //		{CU_CARDINAL, "CARDINAL", 0, "Cardinal", ""},
 //		{CU_BSPLINE, "B_SPLINE", 0, "B-Spline", ""},
 		{CU_NURBS, "NURBS", 0, "NURBS", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	/* identifiers */
 	ot->name = "Set Spline Type";
@@ -3573,7 +3574,8 @@ void CURVE_OT_handle_type_set(wmOperatorType *ot)
 		{5, "ALIGNED", 0, "Aligned", ""},
 		{6, "FREE_ALIGN", 0, "Free", ""},
 		{3, "TOGGLE_FREE_ALIGN", 0, "Toggle Free/Align", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	/* identifiers */
 	ot->name = "Set Handle Type";
@@ -4886,7 +4888,8 @@ void CURVE_OT_cyclic_toggle(wmOperatorType *ot)
 	static EnumPropertyItem direction_items[] = {
 		{0, "CYCLIC_U", 0, "Cyclic U", ""},
 		{1, "CYCLIC_V", 0, "Cyclic V", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	/* identifiers */
 	ot->name = "Toggle Cyclic";
@@ -6007,7 +6010,8 @@ void CURVE_OT_delete(wmOperatorType *ot)
 		{0, "SELECTED", 0, "Select", ""},
 		{1, "SEGMENT", 0, "Segment", ""},
 		{2, "ALL", 0, "All", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	/* identifiers */
 	ot->name = "Delete";
@@ -6101,7 +6105,7 @@ int join_curve_exec(bContext *C, wmOperator *UNUSED(op))
 	/* trasnform all selected curves inverse in obact */
 	invert_m4_m4(imat, ob->obmat);
 	
-	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
+	CTX_DATA_BEGIN(C, Base *, base, selected_editable_bases)
 	{
 		if (base->object->type == ob->type) {
 			if (base->object != ob) {
diff --git a/source/blender/editors/curve/lorem.c b/source/blender/editors/curve/lorem.c
index 66b358e04e5..7823be3df6d 100644
--- a/source/blender/editors/curve/lorem.c
+++ b/source/blender/editors/curve/lorem.c
@@ -25,7 +25,7 @@
 
 #include "curve_intern.h"
 
-const char ED_lorem[]= {
+const char ED_lorem[] = {
 76, 111, 114, 101, 109,  32, 105, 112, 115, 117, 109,  32, 100, 111, 108, 111, 114,  32, 115, 105, 116,  32,  97, 109, 101, 116,  44,  32,  99,
 111, 110, 115, 101,  99, 116, 101, 116, 117, 101, 114,  32,  97, 100, 105, 112, 105, 115,  99, 105, 110, 103,  32, 101, 108, 105, 116,  46,  32,  65, 108, 105,
 113, 117,  97, 109,  32, 116, 114, 105, 115, 116, 105, 113, 117, 101,  32, 105, 110, 116, 101, 114, 100, 117, 109,  32, 115, 101, 109,  46,  32,  78, 117, 108,
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index fc6f406ab59..7f9a998e6d0 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -167,9 +167,9 @@ static int panels_re_align(ScrArea *sa, ARegion *ar, Panel **r_pa)
 static void panels_collapse_all(ScrArea *sa, ARegion *ar)
 {
 	Panel *pa;
-	int flag = ((panel_aligned(sa, ar)==BUT_HORIZONTAL) ? PNL_CLOSEDX : PNL_CLOSEDY);
+	int flag = ((panel_aligned(sa, ar) == BUT_HORIZONTAL) ? PNL_CLOSEDX : PNL_CLOSEDY);
 
-	for (pa= ar->panels.first; pa; pa= pa->next) {
+	for (pa = ar->panels.first; pa; pa = pa->next) {
 		if (pa->type && !(pa->type->flag & PNL_NO_HEADER)) {
 			pa->flag = flag;
 		}
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 1a7fc98ef74..004c5306d65 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -162,9 +162,10 @@ static unsigned int scroll_circle_face[14][3] = {
 };
 
 
-static float menu_tria_vert[6][2]= {
-{-0.33, 0.16}, {0.33, 0.16}, {0, 0.82}, 
-{0, -0.82}, {-0.33, -0.16}, {0.33, -0.16}};
+static float menu_tria_vert[6][2] = {
+	{-0.33, 0.16}, {0.33, 0.16}, {0, 0.82},
+	{0, -0.82}, {-0.33, -0.16}, {0.33, -0.16}
+};
 
 
 
@@ -1168,7 +1169,7 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
 
 #if 0
 	ui_rasterpos_safe(x, y, but->aspect);
-	if (but->type == IDPOIN) transopts = 0;	// no translation, of course!
+	if (but->type == IDPOIN) transopts = 0;  // no translation, of course!
 	else transopts = ui_translate_buttons();
 #endif
 
@@ -3133,7 +3134,7 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
 					if (but->drawflag & UI_BUT_DRAW_ENUM_ARROWS)
 						wt = widget_type(UI_WTYPE_MENU_RADIO);  /* with arrows */
 					else
-						wt = widget_type(UI_WTYPE_MENU_ICON_RADIO); /* no arrows */
+						wt = widget_type(UI_WTYPE_MENU_ICON_RADIO);  /* no arrows */
 				}
 				/* with menu arrows */
 				else
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index f2ea81abcbf..2e70a941a54 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -783,8 +783,8 @@ void ui_theme_init_default(void)
 	/* space nla */
 	btheme->tnla = btheme->tact;
 	
-	rgba_char_args_set(btheme->tnla.anim_active,    204, 112, 26, 102); /* same as for dopesheet; duplicate here for easier reference */
-	rgba_char_args_set(btheme->tnla.anim_non_active,153, 135, 97, 77);
+	rgba_char_args_set(btheme->tnla.anim_active,     204, 112, 26, 102); /* same as for dopesheet; duplicate here for easier reference */
+	rgba_char_args_set(btheme->tnla.anim_non_active, 153, 135, 97, 77);
 	
 	rgba_char_args_set(btheme->tnla.nla_tweaking,   77, 243, 26, 77);
 	rgba_char_args_set(btheme->tnla.nla_tweakdupli, 217, 0, 0, 255);
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index cad6c23eb74..93ed7d37235 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -4830,13 +4830,11 @@ static int edbm_inset_modal(bContext *C, wmOperator *op, wmEvent *event)
 			mdiff[1] = opdata->mcenter[1] - event->mval[1];
 
 			if (opdata->modify_depth) {
-				amount = opdata->old_depth + (len_v2(mdiff)
-				                              - opdata->initial_length) / opdata->initial_length;
+				amount = opdata->old_depth + (len_v2(mdiff) - opdata->initial_length) / opdata->initial_length;
 				RNA_float_set(op->ptr, "depth", amount);
 			}
 			else {
-				amount = opdata->old_thickness - (len_v2(mdiff)
-				                                  - opdata->initial_length) / opdata->initial_length;
+				amount = opdata->old_thickness - (len_v2(mdiff) - opdata->initial_length) / opdata->initial_length;
 				amount = MAX2(amount, 0.0f);
 
 				RNA_float_set(op->ptr, "thickness", amount);
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 24dd56a4834..3d7dd01bf30 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) {
@@ -240,7 +240,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;
@@ -275,7 +275,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) {
@@ -1114,7 +1114,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 path(s) from object */
 		ob->avs.recalc |= ANIMVIZ_RECALC_PATHS;
@@ -1157,7 +1157,7 @@ static int object_calculate_paths_exec(bContext *C, wmOperator *op)
 	int end = RNA_int_get(op->ptr, "end_frame");
 	
 	/* 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)
 	{
 		bAnimVizSettings *avs = &ob->avs;
 		
@@ -1196,9 +1196,9 @@ void OBJECT_OT_paths_calculate(wmOperatorType *ot)
 	
 	/* properties */
 	RNA_def_int(ot->srna, "start_frame", 1, MINAFRAME, MAXFRAME, "Start", 
-	            "First frame to calculate object paths on", MINFRAME, MAXFRAME/2.0);
+	            "First frame to calculate object paths on", MINFRAME, MAXFRAME / 2.0);
 	RNA_def_int(ot->srna, "end_frame", 250, MINAFRAME, MAXFRAME, "End", 
-	            "Last frame to calculate object paths on", MINFRAME, MAXFRAME/2.0);
+	            "Last frame to calculate object paths on", MINFRAME, MAXFRAME / 2.0);
 }
 
 /* --------- */
@@ -1231,7 +1231,7 @@ void OBJECT_OT_paths_update(wmOperatorType *ot)
 	ot->poll = ED_operator_object_active_editable; /* TODO: this should probably check for existing paths */
 	
 	/* flags */
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
 /* --------- */
@@ -1240,7 +1240,7 @@ void OBJECT_OT_paths_update(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);
@@ -1288,7 +1288,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
 	int clear = (strcmp(op->idname, "OBJECT_OT_shade_flat") == 0);
 	int done = FALSE;
 
-	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+	CTX_DATA_BEGIN(C, Object *, ob, selected_editable_objects)
 	{
 
 		if (ob->type == OB_MESH) {
@@ -1666,10 +1666,12 @@ static EnumPropertyItem game_properties_copy_operations[] = {
 	{COPY_PROPERTIES_REPLACE, "REPLACE", 0, "Replace Properties", ""},
 	{COPY_PROPERTIES_MERGE, "MERGE", 0, "Merge Properties", ""},
 	{COPY_PROPERTIES_COPY, "COPY", 0, "Copy a Property", ""},
-	{0, NULL, 0, NULL, NULL}};
+	{0, NULL, 0, NULL, NULL}
+};
 
-static EnumPropertyItem gameprops_items[]= {
-	{0, NULL, 0, NULL, NULL}};
+static EnumPropertyItem gameprops_items[] = {
+	{0, NULL, 0, NULL, NULL}
+};
 
 static EnumPropertyItem *gameprops_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), int *free)
 {	
@@ -1706,7 +1708,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);
@@ -1715,7 +1717,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)
@@ -1756,7 +1758,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);
 	}
@@ -1786,7 +1788,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 */
@@ -1843,7 +1845,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;
diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c
index f6e8ccf4ec9..0a9944debe1 100644
--- a/source/blender/editors/object/object_lattice.c
+++ b/source/blender/editors/object/object_lattice.c
@@ -344,18 +344,17 @@ int mouse_lattice(bContext *C, const int mval[2], int extend, int deselect, int
 	bp = findnearestLattvert(&vc, mval, 1);
 
 	if (bp) {
-	    if (extend) {
-	        bp->f1 |= SELECT;
-	    }
-	    else if (deselect) {
-	        bp->f1 &= ~SELECT;
-	    }
+		if (extend) {
+			bp->f1 |= SELECT;
+		}
+		else if (deselect) {
+			bp->f1 &= ~SELECT;
+		}
 		else if (toggle) {
 			bp->f1 ^= SELECT;  /* swap */
 		}
-		else
-		{
-		    ED_setflagsLatt(vc.obedit, 0);
+		else {
+			ED_setflagsLatt(vc.obedit, 0);
 			bp->f1 |= SELECT;
 		}
 
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index 24b37bb041f..3349a61cd86 100644
--- a/source/blender/editors/space_clip/clip_editor.c
+++ b/source/blender/editors/space_clip/clip_editor.c
@@ -577,7 +577,6 @@ int ED_space_clip_load_movieclip_buffer(SpaceClip *sc, ImBuf *ibuf)
 	SpaceClipDrawContext *context = sc->draw_context;
 	MovieClip *clip = ED_space_clip(sc);
 	int need_rebind = 0;
-	short custom_start_frame = FALSE;
 
 	context->last_texture = glaGetOneInteger(GL_TEXTURE_2D);
 
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index d61dd862096..0cdd7f62c46 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -1047,7 +1047,7 @@ static void clip_main_area_init(wmWindowManager *wm, ARegion *ar)
 	UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_STANDARD, ar->winx, ar->winy);
 
 	/* own keymap */
-	keymap= WM_keymap_find(wm->defaultconf, "Mask Editing", 0, 0);
+	keymap = WM_keymap_find(wm->defaultconf, "Mask Editing", 0, 0);
 	WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
 
 	keymap = WM_keymap_find(wm->defaultconf, "Clip", SPACE_CLIP, 0);