style cleanup: graph & armature

1 files changed, 275 insertions, 275 deletions

diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c
index 8bc2eda7e33..ddcd46ba817 100644
--- a/source/blender/editors/space_graph/graph_buttons.c
+++ b/source/blender/editors/space_graph/graph_buttons.c
@@ -67,12 +67,12 @@
 #include "UI_interface.h"
 #include "UI_resources.h"
 
-#include "graph_intern.h"	// own include
+#include "graph_intern.h"   // own include
 
 /* XXX */
 
 /* temporary definition for limits of float number buttons (FLT_MAX tends to infinity with old system) */
-#define UI_FLT_MAX 	10000.0f
+#define UI_FLT_MAX  10000.0f
 
 
 /* ******************* graph editor space & buttons ************** */
@@ -98,7 +98,7 @@ static void do_graph_region_buttons(bContext *UNUSED(C), void *UNUSED(arg), int
 static int graph_panel_context(const bContext *C, bAnimListElem **ale, FCurve **fcu)
 {
 	bAnimContext ac;
-	bAnimListElem *elem= NULL;
+	bAnimListElem *elem = NULL;
 	
 	/* for now, only draw if we could init the anim-context info (necessary for all animation-related tools) 
 	 * to work correctly is able to be correctly retrieved. There's no point showing empty panels?
@@ -107,14 +107,14 @@ static int graph_panel_context(const bContext *C, bAnimListElem **ale, FCurve **
 		return 0;
 	
 	/* try to find 'active' F-Curve */
-	elem= get_active_fcurve_channel(&ac);
+	elem = get_active_fcurve_channel(&ac);
 	if (elem == NULL) 
 		return 0;
 	
 	if (fcu)
-		*fcu= (FCurve*)elem->data;
+		*fcu = (FCurve *)elem->data;
 	if (ale)
-		*ale= elem;
+		*ale = elem;
 	else
 		MEM_freeN(elem);
 	
@@ -131,9 +131,9 @@ static int graph_panel_poll(const bContext *C, PanelType *UNUSED(pt))
 /* Graph Editor View Settings */
 static void graph_panel_view(const bContext *C, Panel *pa)
 {
-	bScreen *sc= CTX_wm_screen(C);
-	SpaceIpo *sipo= CTX_wm_space_graph(C);
-	Scene *scene= CTX_data_scene(C);
+	bScreen *sc = CTX_wm_screen(C);
+	SpaceIpo *sipo = CTX_wm_space_graph(C);
+	Scene *scene = CTX_data_scene(C);
 	PointerRNA spaceptr, sceneptr;
 	uiLayout *col, *sub, *row;
 	
@@ -142,21 +142,21 @@ static void graph_panel_view(const bContext *C, Panel *pa)
 	RNA_pointer_create(&sc->id, &RNA_SpaceGraphEditor, sipo, &spaceptr);
 
 	/* 2D-Cursor */
-	col= uiLayoutColumn(pa->layout, 0);
-		uiItemR(col, &spaceptr, "show_cursor", 0, NULL, ICON_NONE);
+	col = uiLayoutColumn(pa->layout, 0);
+	uiItemR(col, &spaceptr, "show_cursor", 0, NULL, ICON_NONE);
 		
-		sub= uiLayoutColumn(col, 1);
-		uiLayoutSetActive(sub, RNA_boolean_get(&spaceptr, "show_cursor")); 
-			uiItemO(sub, IFACE_("Cursor from Selection"), ICON_NONE, "GRAPH_OT_frame_jump");
-		
-		sub= uiLayoutColumn(col, 1);
-		uiLayoutSetActive(sub, RNA_boolean_get(&spaceptr, "show_cursor")); 
-			row= uiLayoutSplit(sub, 0.7, 1);
-				uiItemR(row, &sceneptr, "frame_current", 0, IFACE_("Cursor X"), ICON_NONE);
-				uiItemEnumO(row, "GRAPH_OT_snap", IFACE_("To Keys"), 0, "type", GRAPHKEYS_SNAP_CFRA);
-			row= uiLayoutSplit(sub, 0.7, 1);
-				uiItemR(row, &spaceptr, "cursor_position_y", 0, IFACE_("Cursor Y"), ICON_NONE);
-				uiItemEnumO(row, "GRAPH_OT_snap", IFACE_("To Keys"), 0, "type", GRAPHKEYS_SNAP_VALUE);
+	sub = uiLayoutColumn(col, 1);
+	uiLayoutSetActive(sub, RNA_boolean_get(&spaceptr, "show_cursor"));
+	uiItemO(sub, IFACE_("Cursor from Selection"), ICON_NONE, "GRAPH_OT_frame_jump");
+
+	sub = uiLayoutColumn(col, 1);
+	uiLayoutSetActive(sub, RNA_boolean_get(&spaceptr, "show_cursor"));
+	row = uiLayoutSplit(sub, 0.7, 1);
+	uiItemR(row, &sceneptr, "frame_current", 0, IFACE_("Cursor X"), ICON_NONE);
+	uiItemEnumO(row, "GRAPH_OT_snap", IFACE_("To Keys"), 0, "type", GRAPHKEYS_SNAP_CFRA);
+	row = uiLayoutSplit(sub, 0.7, 1);
+	uiItemR(row, &spaceptr, "cursor_position_y", 0, IFACE_("Cursor Y"), ICON_NONE);
+	uiItemEnumO(row, "GRAPH_OT_snap", IFACE_("To Keys"), 0, "type", GRAPHKEYS_SNAP_VALUE);
 }
 
 /* ******************* active F-Curve ************** */
@@ -175,7 +175,7 @@ static void graph_panel_properties(const bContext *C, Panel *pa)
 	if (!graph_panel_context(C, &ale, &fcu))
 		return;
 	
-	block= uiLayoutGetBlock(layout);
+	block = uiLayoutGetBlock(layout);
 	uiBlockSetHandleFunc(block, do_graph_region_buttons, NULL);
 	
 	/* F-Curve pointer */
@@ -183,26 +183,26 @@ static void graph_panel_properties(const bContext *C, Panel *pa)
 	
 	/* user-friendly 'name' for F-Curve */
 	/* TODO: only show the path if this is invalid? */
-	col= uiLayoutColumn(layout, 0);
-		icon= getname_anim_fcurve(name, ale->id, fcu);
-		uiItemL(col, name, icon);
+	col = uiLayoutColumn(layout, 0);
+	icon = getname_anim_fcurve(name, ale->id, fcu);
+	uiItemL(col, name, icon);
 		
 	/* RNA-Path Editing - only really should be enabled when things aren't working */
-	col= uiLayoutColumn(layout, 1);
-		uiLayoutSetEnabled(col, (fcu->flag & FCURVE_DISABLED)!=0); 
-		uiItemR(col, &fcu_ptr, "data_path", 0, "", ICON_RNA);
-		uiItemR(col, &fcu_ptr, "array_index", 0, NULL, ICON_NONE);
+	col = uiLayoutColumn(layout, 1);
+	uiLayoutSetEnabled(col, (fcu->flag & FCURVE_DISABLED) != 0);
+	uiItemR(col, &fcu_ptr, "data_path", 0, "", ICON_RNA);
+	uiItemR(col, &fcu_ptr, "array_index", 0, NULL, ICON_NONE);
 		
 	/* color settings */
-	col= uiLayoutColumn(layout, 1);
-		uiItemL(col, IFACE_("Display Color:"), ICON_NONE);
+	col = uiLayoutColumn(layout, 1);
+	uiItemL(col, IFACE_("Display Color:"), ICON_NONE);
 		
-		row= uiLayoutRow(col, 1);
-			uiItemR(row, &fcu_ptr, "color_mode", 0, "", ICON_NONE);
+	row = uiLayoutRow(col, 1);
+	uiItemR(row, &fcu_ptr, "color_mode", 0, "", ICON_NONE);
 			
-			sub= uiLayoutRow(row, 1);
-				uiLayoutSetEnabled(sub, (fcu->color_mode==FCURVE_COLOR_CUSTOM));
-				uiItemR(sub, &fcu_ptr, "color", 0, "", ICON_NONE);
+	sub = uiLayoutRow(row, 1);
+	uiLayoutSetEnabled(sub, (fcu->color_mode == FCURVE_COLOR_CUSTOM));
+	uiItemR(sub, &fcu_ptr, "color", 0, "", ICON_NONE);
 	
 	MEM_freeN(ale);
 }
@@ -226,13 +226,13 @@ static short get_active_fcurve_keyframe_edit(FCurve *fcu, BezTriple **bezt, BezT
 	 *	- this is a reasonable assumption, given that whenever anyone 
 	 *	  wants to edit numerically, there is likely to only be 1 vert selected
 	 */
-	for (i=0, b=fcu->bezt; i < fcu->totvert; i++, b++) {
+	for (i = 0, b = fcu->bezt; i < fcu->totvert; i++, b++) {
 		if (BEZSELECTED(b)) {
 			/* found 
 			 *	- 'previous' is either the one before, of the keyframe itself (which is still fine)
 			 *		XXX: we can just make this null instead if needed
 			 */
-			*prevbezt = (i > 0) ? b-1 : b;
+			*prevbezt = (i > 0) ? b - 1 : b;
 			*bezt = b;
 			
 			return 1;
@@ -246,7 +246,7 @@ static short get_active_fcurve_keyframe_edit(FCurve *fcu, BezTriple **bezt, BezT
 /* update callback for active keyframe properties - base updates stuff */
 static void graphedit_activekey_update_cb(bContext *C, void *fcu_ptr, void *UNUSED(bezt_ptr))
 {
-	SpaceIpo *sipo= CTX_wm_space_graph(C);
+	SpaceIpo *sipo = CTX_wm_space_graph(C);
 	const short use_handle = !(sipo->flag & SIPO_NOHANDLES);
 	FCurve *fcu = (FCurve *)fcu_ptr;
 	
@@ -265,8 +265,8 @@ static void graphedit_activekey_handles_cb(bContext *C, void *fcu_ptr, void *bez
 	 */
 	if (ELEM(bezt->h1, HD_AUTO, HD_AUTO_ANIM) && ELEM(bezt->h2, HD_AUTO, HD_AUTO_ANIM)) {
 		/* by changing to aligned handles, these can now be moved... */
-		bezt->h1= HD_ALIGN;
-		bezt->h2= HD_ALIGN;
+		bezt->h1 = HD_ALIGN;
+		bezt->h2 = HD_ALIGN;
 	}
 	
 	/* now call standard updates */
@@ -307,56 +307,56 @@ static void graph_panel_key_properties(const bContext *C, Panel *pa)
 		}		
 		
 		/* interpolation */
-		col= uiLayoutColumn(layout, 0);
-			uiItemR(col, &bezt_ptr, "interpolation", 0, NULL, ICON_NONE);
+		col = uiLayoutColumn(layout, 0);
+		uiItemR(col, &bezt_ptr, "interpolation", 0, NULL, ICON_NONE);
 			
 		/* numerical coordinate editing 
-		 * 	- we use the button-versions of the calls so that we can attach special update handlers
-		 * 	  and unit conversion magic that cannot be achieved using a purely RNA-approach
+		 *  - we use the button-versions of the calls so that we can attach special update handlers
+		 *    and unit conversion magic that cannot be achieved using a purely RNA-approach
 		 */
 		// XXX: 
-		col= uiLayoutColumn(layout, 1);
-			/* keyframe itself */
-			{
-				uiItemL(col, IFACE_("Key:"), ICON_NONE);
-				
-				but = uiDefButR(block, NUM, B_REDR, IFACE_("Frame"), 0, 0, UI_UNIT_X, UI_UNIT_Y,
-				                &bezt_ptr, "co", 0, 0, 0, -1, -1, NULL);
-				uiButSetFunc(but, graphedit_activekey_update_cb, fcu, bezt);
-				
-				but = uiDefButR(block, NUM, B_REDR, IFACE_("Value"), 0, 0, UI_UNIT_X, UI_UNIT_Y,
-				                &bezt_ptr, "co", 1, 0, 0, -1, -1, NULL);
-				uiButSetFunc(but, graphedit_activekey_update_cb, fcu, bezt);
-				uiButSetUnitType(but, unit);
-			}
-			
-			/* previous handle - only if previous was Bezier interpolation */
-			if ((prevbezt) && (prevbezt->ipo == BEZT_IPO_BEZ)) {
-				uiItemL(col, IFACE_("Left Handle:"), ICON_NONE);
-				
-				but = uiDefButR(block, NUM, B_REDR, "X", 0, 0, UI_UNIT_X, UI_UNIT_Y,
-				                &bezt_ptr, "handle_left", 0, 0, 0, -1, -1, NULL);
-				uiButSetFunc(but, graphedit_activekey_handles_cb, fcu, bezt);
-				
-				but = uiDefButR(block, NUM, B_REDR, "Y", 0, 0, UI_UNIT_X, UI_UNIT_Y,
-				                &bezt_ptr, "handle_left", 1, 0, 0, -1, -1, NULL);
-				uiButSetFunc(but, graphedit_activekey_handles_cb, fcu, bezt);
-				uiButSetUnitType(but, unit);
-			}
-			
-			/* next handle - only if current is Bezier interpolation */
-			if (bezt->ipo == BEZT_IPO_BEZ) {
-				uiItemL(col, IFACE_("Right Handle:"), ICON_NONE);
-				
-				but = uiDefButR(block, NUM, B_REDR, "X", 0, 0, UI_UNIT_X, UI_UNIT_Y,
-				                &bezt_ptr, "handle_right", 0, 0, 0, -1, -1, NULL);
-				uiButSetFunc(but, graphedit_activekey_handles_cb, fcu, bezt);
-				
-				but = uiDefButR(block, NUM, B_REDR, "Y", 0, 0, UI_UNIT_X, UI_UNIT_Y,
-				                &bezt_ptr, "handle_right", 1, 0, 0, -1, -1, NULL);
-				uiButSetFunc(but, graphedit_activekey_handles_cb, fcu, bezt);
-				uiButSetUnitType(but, unit);
-			}
+		col = uiLayoutColumn(layout, 1);
+		/* keyframe itself */
+		{
+			uiItemL(col, IFACE_("Key:"), ICON_NONE);
+
+			but = uiDefButR(block, NUM, B_REDR, IFACE_("Frame"), 0, 0, UI_UNIT_X, UI_UNIT_Y,
+			                &bezt_ptr, "co", 0, 0, 0, -1, -1, NULL);
+			uiButSetFunc(but, graphedit_activekey_update_cb, fcu, bezt);
+
+			but = uiDefButR(block, NUM, B_REDR, IFACE_("Value"), 0, 0, UI_UNIT_X, UI_UNIT_Y,
+			                &bezt_ptr, "co", 1, 0, 0, -1, -1, NULL);
+			uiButSetFunc(but, graphedit_activekey_update_cb, fcu, bezt);
+			uiButSetUnitType(but, unit);
+		}
+
+		/* previous handle - only if previous was Bezier interpolation */
+		if ((prevbezt) && (prevbezt->ipo == BEZT_IPO_BEZ)) {
+			uiItemL(col, IFACE_("Left Handle:"), ICON_NONE);
+
+			but = uiDefButR(block, NUM, B_REDR, "X", 0, 0, UI_UNIT_X, UI_UNIT_Y,
+			                &bezt_ptr, "handle_left", 0, 0, 0, -1, -1, NULL);
+			uiButSetFunc(but, graphedit_activekey_handles_cb, fcu, bezt);
+
+			but = uiDefButR(block, NUM, B_REDR, "Y", 0, 0, UI_UNIT_X, UI_UNIT_Y,
+			                &bezt_ptr, "handle_left", 1, 0, 0, -1, -1, NULL);
+			uiButSetFunc(but, graphedit_activekey_handles_cb, fcu, bezt);
+			uiButSetUnitType(but, unit);
+		}
+
+		/* next handle - only if current is Bezier interpolation */
+		if (bezt->ipo == BEZT_IPO_BEZ) {
+			uiItemL(col, IFACE_("Right Handle:"), ICON_NONE);
+
+			but = uiDefButR(block, NUM, B_REDR, "X", 0, 0, UI_UNIT_X, UI_UNIT_Y,
+			                &bezt_ptr, "handle_right", 0, 0, 0, -1, -1, NULL);
+			uiButSetFunc(but, graphedit_activekey_handles_cb, fcu, bezt);
+
+			but = uiDefButR(block, NUM, B_REDR, "Y", 0, 0, UI_UNIT_X, UI_UNIT_Y,
+			                &bezt_ptr, "handle_right", 1, 0, 0, -1, -1, NULL);
+			uiButSetFunc(but, graphedit_activekey_handles_cb, fcu, bezt);
+			uiButSetUnitType(but, unit);
+		}
 	}
 	else {
 		if ((fcu->bezt == NULL) && (fcu->modifiers.first)) {
@@ -378,12 +378,12 @@ static void graph_panel_key_properties(const bContext *C, Panel *pa)
 
 /* ******************* drivers ******************************** */
 
-#define B_IPO_DEPCHANGE 	10
+#define B_IPO_DEPCHANGE     10
 
 static void do_graph_region_driver_buttons(bContext *C, void *UNUSED(arg), int event)
 {
-	Main *bmain= CTX_data_main(C);
-	Scene *scene= CTX_data_scene(C);
+	Main *bmain = CTX_data_main(C);
+	Scene *scene = CTX_data_scene(C);
 	
 	switch (event) {
 		case B_IPO_DEPCHANGE:
@@ -394,19 +394,19 @@ static void do_graph_region_driver_buttons(bContext *C, void *UNUSED(arg), int e
 			/* force an update of depsgraph */
 			DAG_ids_flush_update(bmain, 0);
 		}
-			break;
+		break;
 	}
 	
 	/* default for now */
-	WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene); // XXX could use better notifier
+	WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene); // XXX could use better notifier
 }
 
 /* callback to remove the active driver */
-static void driver_remove_cb (bContext *C, void *ale_v, void *UNUSED(arg))
+static void driver_remove_cb(bContext *C, void *ale_v, void *UNUSED(arg))
 {
-	bAnimListElem *ale= (bAnimListElem *)ale_v;
-	ID *id= ale->id;
-	FCurve *fcu= ale->data;
+	bAnimListElem *ale = (bAnimListElem *)ale_v;
+	ID *id = ale->id;
+	FCurve *fcu = ale->data;
 	ReportList *reports = CTX_wm_reports(C);
 	
 	/* try to get F-Curve that driver lives on, and ID block which has this AnimData */
@@ -418,29 +418,29 @@ static void driver_remove_cb (bContext *C, void *ale_v, void *UNUSED(arg))
 }
 
 /* callback to add a target variable to the active driver */
-static void driver_add_var_cb (bContext *UNUSED(C), void *driver_v, void *UNUSED(arg))
+static void driver_add_var_cb(bContext *UNUSED(C), void *driver_v, void *UNUSED(arg))
 {
-	ChannelDriver *driver= (ChannelDriver *)driver_v;
+	ChannelDriver *driver = (ChannelDriver *)driver_v;
 	
 	/* add a new variable */
 	driver_add_new_variable(driver);
 }
 
 /* callback to remove target variable from active driver */
-static void driver_delete_var_cb (bContext *UNUSED(C), void *driver_v, void *dvar_v)
+static void driver_delete_var_cb(bContext *UNUSED(C), void *driver_v, void *dvar_v)
 {
-	ChannelDriver *driver= (ChannelDriver *)driver_v;
-	DriverVar *dvar= (DriverVar *)dvar_v;
+	ChannelDriver *driver = (ChannelDriver *)driver_v;
+	DriverVar *dvar = (DriverVar *)dvar_v;
 	
 	/* remove the active variable */
 	driver_free_variable(driver, dvar);
 }
 
 /* callback to reset the driver's flags */
-static void driver_update_flags_cb (bContext *UNUSED(C), void *fcu_v, void *UNUSED(arg))
+static void driver_update_flags_cb(bContext *UNUSED(C), void *fcu_v, void *UNUSED(arg))
 {
-	FCurve *fcu= (FCurve *)fcu_v;
-	ChannelDriver *driver= fcu->driver;
+	FCurve *fcu = (FCurve *)fcu_v;
+	ChannelDriver *driver = fcu->driver;
 	
 	/* clear invalid flags */
 	fcu->flag &= ~FCURVE_DISABLED; // XXX?
@@ -450,7 +450,7 @@ static void driver_update_flags_cb (bContext *UNUSED(C), void *fcu_v, void *UNUS
 /* drivers panel poll */
 static int graph_panel_drivers_poll(const bContext *C, PanelType *UNUSED(pt))
 {
-	SpaceIpo *sipo= CTX_wm_space_graph(C);
+	SpaceIpo *sipo = CTX_wm_space_graph(C);
 
 	if (sipo->mode != SIPO_MODE_DRIVERS)
 		return 0;
@@ -461,7 +461,7 @@ static int graph_panel_drivers_poll(const bContext *C, PanelType *UNUSED(pt))
 /* settings for 'single property' driver variable type */
 static void graph_panel_driverVar__singleProp(uiLayout *layout, ID *id, DriverVar *dvar)
 {
-	DriverTarget *dtar= &dvar->targets[0];
+	DriverTarget *dtar = &dvar->targets[0];
 	PointerRNA dtar_ptr;
 	uiLayout *row, *col;
 	
@@ -469,8 +469,8 @@ static void graph_panel_driverVar__singleProp(uiLayout *layout, ID *id, DriverVa
 	RNA_pointer_create(id, &RNA_DriverTarget, dtar, &dtar_ptr); 
 	
 	/* Target ID */
-	row= uiLayoutRow(layout, 0);
-		uiTemplateAnyID(row, &dtar_ptr, "id", "id_type", IFACE_("Prop:"));
+	row = uiLayoutRow(layout, 0);
+	uiTemplateAnyID(row, &dtar_ptr, "id", "id_type", IFACE_("Prop:"));
 	
 	/* Target Property */
 	// TODO: make this less technical...
@@ -480,7 +480,7 @@ static void graph_panel_driverVar__singleProp(uiLayout *layout, ID *id, DriverVa
 		/* get pointer for resolving the property selected */
 		RNA_id_pointer_create(dtar->id, &root_ptr);
 		
-		col= uiLayoutColumn(layout, 1);
+		col = uiLayoutColumn(layout, 1);
 		/* rna path */
 		uiTemplatePathBuilder(col, &dtar_ptr, "data_path", &root_ptr, IFACE_("Path"));
 	}
@@ -489,8 +489,8 @@ static void graph_panel_driverVar__singleProp(uiLayout *layout, ID *id, DriverVa
 /* settings for 'rotation difference' driver variable type */
 static void graph_panel_driverVar__rotDiff(uiLayout *layout, ID *id, DriverVar *dvar)
 {
-	DriverTarget *dtar= &dvar->targets[0];
-	DriverTarget *dtar2= &dvar->targets[1];
+	DriverTarget *dtar = &dvar->targets[0];
+	DriverTarget *dtar2 = &dvar->targets[1];
 	Object *ob1 = (Object *)dtar->id;
 	Object *ob2 = (Object *)dtar2->id;
 	PointerRNA dtar_ptr, dtar2_ptr;
@@ -501,32 +501,32 @@ static void graph_panel_driverVar__rotDiff(uiLayout *layout, ID *id, DriverVar *
 	RNA_pointer_create(id, &RNA_DriverTarget, dtar2, &dtar2_ptr); 
 	
 	/* Bone 1 */
-	col= uiLayoutColumn(layout, 1);
-		uiTemplateAnyID(col, &dtar_ptr, "id", "id_type", IFACE_("Bone 1:"));
+	col = uiLayoutColumn(layout, 1);
+	uiTemplateAnyID(col, &dtar_ptr, "id", "id_type", IFACE_("Bone 1:"));
 		
-		if (dtar->id && ob1->pose) {
-			PointerRNA tar_ptr;
+	if (dtar->id && ob1->pose) {
+		PointerRNA tar_ptr;
 			
-			RNA_pointer_create(dtar->id, &RNA_Pose, ob1->pose, &tar_ptr);
-			uiItemPointerR(col, &dtar_ptr, "bone_target", &tar_ptr, "bones", "", ICON_BONE_DATA);
-		}
+		RNA_pointer_create(dtar->id, &RNA_Pose, ob1->pose, &tar_ptr);
+		uiItemPointerR(col, &dtar_ptr, "bone_target", &tar_ptr, "bones", "", ICON_BONE_DATA);
+	}
 	
-	col= uiLayoutColumn(layout, 1);
-		uiTemplateAnyID(col, &dtar2_ptr, "id", "id_type", IFACE_("Bone 2:"));
+	col = uiLayoutColumn(layout, 1);
+	uiTemplateAnyID(col, &dtar2_ptr, "id", "id_type", IFACE_("Bone 2:"));
 		
-		if (dtar2->id && ob2->pose) {
-			PointerRNA tar_ptr;
+	if (dtar2->id && ob2->pose) {
+		PointerRNA tar_ptr;
 			
-			RNA_pointer_create(dtar2->id, &RNA_Pose, ob2->pose, &tar_ptr);
-			uiItemPointerR(col, &dtar2_ptr, "bone_target", &tar_ptr, "bones", "", ICON_BONE_DATA);
-		}
+		RNA_pointer_create(dtar2->id, &RNA_Pose, ob2->pose, &tar_ptr);
+		uiItemPointerR(col, &dtar2_ptr, "bone_target", &tar_ptr, "bones", "", ICON_BONE_DATA);
+	}
 }
 
 /* settings for 'location difference' driver variable type */
 static void graph_panel_driverVar__locDiff(uiLayout *layout, ID *id, DriverVar *dvar)
 {
-	DriverTarget *dtar= &dvar->targets[0];
-	DriverTarget *dtar2= &dvar->targets[1];
+	DriverTarget *dtar = &dvar->targets[0];
+	DriverTarget *dtar2 = &dvar->targets[1];
 	Object *ob1 = (Object *)dtar->id;
 	Object *ob2 = (Object *)dtar2->id;
 	PointerRNA dtar_ptr, dtar2_ptr;
@@ -537,35 +537,35 @@ static void graph_panel_driverVar__locDiff(uiLayout *layout, ID *id, DriverVar *
 	RNA_pointer_create(id, &RNA_DriverTarget, dtar2, &dtar2_ptr); 
 	
 	/* Bone 1 */
-	col= uiLayoutColumn(layout, 1);
-		uiTemplateAnyID(col, &dtar_ptr, "id", "id_type", IFACE_("Ob/Bone 1:"));
+	col = uiLayoutColumn(layout, 1);
+	uiTemplateAnyID(col, &dtar_ptr, "id", "id_type", IFACE_("Ob/Bone 1:"));
 		
-		if (dtar->id && ob1->pose) {
-			PointerRNA tar_ptr;
+	if (dtar->id && ob1->pose) {
+		PointerRNA tar_ptr;
 			
-			RNA_pointer_create(dtar->id, &RNA_Pose, ob1->pose, &tar_ptr);
-			uiItemPointerR(col, &dtar_ptr, "bone_target", &tar_ptr, "bones", "", ICON_BONE_DATA);
-		}
+		RNA_pointer_create(dtar->id, &RNA_Pose, ob1->pose, &tar_ptr);
+		uiItemPointerR(col, &dtar_ptr, "bone_target", &tar_ptr, "bones", "", ICON_BONE_DATA);
+	}
 		
-		uiItemR(col, &dtar_ptr, "transform_space", 0, NULL, ICON_NONE);
+	uiItemR(col, &dtar_ptr, "transform_space", 0, NULL, ICON_NONE);
 	
-	col= uiLayoutColumn(layout, 1);
-		uiTemplateAnyID(col, &dtar2_ptr, "id", "id_type", IFACE_("Ob/Bone 2:"));
+	col = uiLayoutColumn(layout, 1);
+	uiTemplateAnyID(col, &dtar2_ptr, "id", "id_type", IFACE_("Ob/Bone 2:"));
 		
-		if (dtar2->id && ob2->pose) {
-			PointerRNA tar_ptr;
+	if (dtar2->id && ob2->pose) {
+		PointerRNA tar_ptr;
 			
-			RNA_pointer_create(dtar2->id, &RNA_Pose, ob2->pose, &tar_ptr);
-			uiItemPointerR(col, &dtar2_ptr, "bone_target", &tar_ptr, "bones", "", ICON_BONE_DATA);
-		}
+		RNA_pointer_create(dtar2->id, &RNA_Pose, ob2->pose, &tar_ptr);
+		uiItemPointerR(col, &dtar2_ptr, "bone_target", &tar_ptr, "bones", "", ICON_BONE_DATA);
+	}
 		
-		uiItemR(col, &dtar2_ptr, "transform_space", 0, NULL, ICON_NONE);
+	uiItemR(col, &dtar2_ptr, "transform_space", 0, NULL, ICON_NONE);
 }
 
 /* settings for 'transform channel' driver variable type */
 static void graph_panel_driverVar__transChan(uiLayout *layout, ID *id, DriverVar *dvar)
 {
-	DriverTarget *dtar= &dvar->targets[0];
+	DriverTarget *dtar = &dvar->targets[0];
 	Object *ob = (Object *)dtar->id;
 	PointerRNA dtar_ptr;
 	uiLayout *col, *sub;
@@ -574,19 +574,19 @@ static void graph_panel_driverVar__transChan(uiLayout *layout, ID *id, DriverVar
 	RNA_pointer_create(id, &RNA_DriverTarget, dtar, &dtar_ptr); 
 	
 	/* properties */
-	col= uiLayoutColumn(layout, 1);
-		uiTemplateAnyID(col, &dtar_ptr, "id", "id_type", IFACE_("Ob/Bone:"));
+	col = uiLayoutColumn(layout, 1);
+	uiTemplateAnyID(col, &dtar_ptr, "id", "id_type", IFACE_("Ob/Bone:"));
 		
-		if (dtar->id && ob->pose) {
-			PointerRNA tar_ptr;
+	if (dtar->id && ob->pose) {
+		PointerRNA tar_ptr;
 			
-			RNA_pointer_create(dtar->id, &RNA_Pose, ob->pose, &tar_ptr);
-			uiItemPointerR(col, &dtar_ptr, "bone_target", &tar_ptr, "bones", "", ICON_BONE_DATA);
-		}
+		RNA_pointer_create(dtar->id, &RNA_Pose, ob->pose, &tar_ptr);
+		uiItemPointerR(col, &dtar_ptr, "bone_target", &tar_ptr, "bones", "", ICON_BONE_DATA);
+	}
 		
-		sub= uiLayoutColumn(layout, 1);
-			uiItemR(sub, &dtar_ptr, "transform_type", 0, NULL, ICON_NONE);
-			uiItemR(sub, &dtar_ptr, "transform_space", 0, IFACE_("Space"), ICON_NONE);
+	sub = uiLayoutColumn(layout, 1);
+	uiItemR(sub, &dtar_ptr, "transform_type", 0, NULL, ICON_NONE);
+	uiItemR(sub, &dtar_ptr, "transform_space", 0, IFACE_("Space"), ICON_NONE);
 }
 
 /* driver settings for active F-Curve (only for 'Drivers' mode) */
@@ -605,125 +605,125 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
 	/* Get settings from context */
 	if (!graph_panel_context(C, &ale, &fcu))
 		return;
-	driver= fcu->driver;
+	driver = fcu->driver;
 	
 	/* set event handler for panel */
-	block= uiLayoutGetBlock(pa->layout); // xxx?
+	block = uiLayoutGetBlock(pa->layout); // xxx?
 	uiBlockSetHandleFunc(block, do_graph_region_driver_buttons, NULL);
 	
 	/* general actions - management */
-	col= uiLayoutColumn(pa->layout, 0);
-	block= uiLayoutGetBlock(col);
-		but = uiDefBut(block, BUT, B_IPO_DEPCHANGE, IFACE_("Update Dependencies"), 0, 0, 10*UI_UNIT_X, 22,
-		              NULL, 0.0, 0.0, 0, 0, TIP_("Force updates of dependencies"));
-		uiButSetFunc(but, driver_update_flags_cb, fcu, NULL);
-		
-		but = uiDefBut(block, BUT, B_IPO_DEPCHANGE, IFACE_("Remove Driver"), 0, 0, 10*UI_UNIT_X, 18,
-		              NULL, 0.0, 0.0, 0, 0, TIP_("Remove this driver"));
-		uiButSetNFunc(but, driver_remove_cb, MEM_dupallocN(ale), NULL);
+	col = uiLayoutColumn(pa->layout, 0);
+	block = uiLayoutGetBlock(col);
+	but = uiDefBut(block, BUT, B_IPO_DEPCHANGE, IFACE_("Update Dependencies"), 0, 0, 10 * UI_UNIT_X, 22,
+	               NULL, 0.0, 0.0, 0, 0, TIP_("Force updates of dependencies"));
+	uiButSetFunc(but, driver_update_flags_cb, fcu, NULL);
+
+	but = uiDefBut(block, BUT, B_IPO_DEPCHANGE, IFACE_("Remove Driver"), 0, 0, 10 * UI_UNIT_X, 18,
+	               NULL, 0.0, 0.0, 0, 0, TIP_("Remove this driver"));
+	uiButSetNFunc(but, driver_remove_cb, MEM_dupallocN(ale), NULL);
 		
 	/* driver-level settings - type, expressions, and errors */
 	RNA_pointer_create(ale->id, &RNA_Driver, driver, &driver_ptr);
 	
-	col= uiLayoutColumn(pa->layout, 1);
-	block= uiLayoutGetBlock(col);
-		uiItemR(col, &driver_ptr, "type", 0, NULL, ICON_NONE);
-		
-		/* show expression box if doing scripted drivers, and/or error messages when invalid drivers exist */
-		if (driver->type == DRIVER_TYPE_PYTHON) {
-			/* expression */
-			uiItemR(col, &driver_ptr, "expression", 0, IFACE_("Expr"), ICON_NONE);
-			
-			/* errors? */
-			if (driver->flag & DRIVER_FLAG_INVALID)
-				uiItemL(col, IFACE_("ERROR: invalid Python expression"), ICON_ERROR);
-		}
-		else {
-			/* errors? */
-			if (driver->flag & DRIVER_FLAG_INVALID)
-				uiItemL(col, IFACE_("ERROR: invalid target channel(s)"), ICON_ERROR);
-		}
+	col = uiLayoutColumn(pa->layout, 1);
+	block = uiLayoutGetBlock(col);
+	uiItemR(col, &driver_ptr, "type", 0, NULL, ICON_NONE);
+
+	/* show expression box if doing scripted drivers, and/or error messages when invalid drivers exist */
+	if (driver->type == DRIVER_TYPE_PYTHON) {
+		/* expression */
+		uiItemR(col, &driver_ptr, "expression", 0, IFACE_("Expr"), ICON_NONE);
+
+		/* errors? */
+		if (driver->flag & DRIVER_FLAG_INVALID)
+			uiItemL(col, IFACE_("ERROR: invalid Python expression"), ICON_ERROR);
+	}
+	else {
+		/* errors? */
+		if (driver->flag & DRIVER_FLAG_INVALID)
+			uiItemL(col, IFACE_("ERROR: invalid target channel(s)"), ICON_ERROR);
+	}
 		
-	col= uiLayoutColumn(pa->layout, 1);
-		/* debug setting */
-		uiItemR(col, &driver_ptr, "show_debug_info", 0, NULL, ICON_NONE);
+	col = uiLayoutColumn(pa->layout, 1);
+	/* debug setting */
+	uiItemR(col, &driver_ptr, "show_debug_info", 0, NULL, ICON_NONE);
 		
-		/* value of driver */
-		if (driver->flag & DRIVER_FLAG_SHOWDEBUG) {
-			uiLayout *row= uiLayoutRow(col, 1);
-			char valBuf[32];
+	/* value of driver */
+	if (driver->flag & DRIVER_FLAG_SHOWDEBUG) {
+		uiLayout *row = uiLayoutRow(col, 1);
+		char valBuf[32];
 			
-			uiItemL(row, IFACE_("Driver Value:"), ICON_NONE);
+		uiItemL(row, IFACE_("Driver Value:"), ICON_NONE);
 			
-			BLI_snprintf(valBuf, sizeof(valBuf), "%.3f", driver->curval);
-			uiItemL(row, valBuf, ICON_NONE);
-		}
+		BLI_snprintf(valBuf, sizeof(valBuf), "%.3f", driver->curval);
+		uiItemL(row, valBuf, ICON_NONE);
+	}
 	
 	/* add driver variables */
-	col= uiLayoutColumn(pa->layout, 0);
-	block= uiLayoutGetBlock(col);
-		but = uiDefBut(block, BUT, B_IPO_DEPCHANGE, IFACE_("Add Variable"), 0, 0, 10*UI_UNIT_X, UI_UNIT_Y,
-		              NULL, 0.0, 0.0, 0, 0, TIP_("Add a new target variable for this Driver"));
-		uiButSetFunc(but, driver_add_var_cb, driver, NULL);
+	col = uiLayoutColumn(pa->layout, 0);
+	block = uiLayoutGetBlock(col);
+	but = uiDefBut(block, BUT, B_IPO_DEPCHANGE, IFACE_("Add Variable"), 0, 0, 10 * UI_UNIT_X, UI_UNIT_Y,
+	               NULL, 0.0, 0.0, 0, 0, TIP_("Add a new target variable for this Driver"));
+	uiButSetFunc(but, driver_add_var_cb, driver, NULL);
 	
 	/* loop over targets, drawing them */
-	for (dvar= driver->variables.first; dvar; dvar= dvar->next) {
+	for (dvar = driver->variables.first; dvar; dvar = dvar->next) {
 		PointerRNA dvar_ptr;
 		uiLayout *box, *row;
 		
 		/* sub-layout column for this variable's settings */
-		col= uiLayoutColumn(pa->layout, 1);
+		col = uiLayoutColumn(pa->layout, 1);
 		
 		/* header panel */
-		box= uiLayoutBox(col);
-			/* first row context info for driver */
-			RNA_pointer_create(ale->id, &RNA_DriverVariable, dvar, &dvar_ptr);
-			
-			row= uiLayoutRow(box, 0);
-			block= uiLayoutGetBlock(row);
-				/* variable name */
-				uiItemR(row, &dvar_ptr, "name", 0, "", ICON_NONE);
-				
-				/* remove button */
-				uiBlockSetEmboss(block, UI_EMBOSSN);
-					but = uiDefIconBut(block, BUT, B_IPO_DEPCHANGE, ICON_X, 290, 0, UI_UNIT_X, UI_UNIT_Y,
-					                  NULL, 0.0, 0.0, 0.0, 0.0, IFACE_("Delete target variable"));
-					uiButSetFunc(but, driver_delete_var_cb, driver, dvar);
-				uiBlockSetEmboss(block, UI_EMBOSS);
-			
-			/* variable type */
-			row= uiLayoutRow(box, 0);
-				uiItemR(row, &dvar_ptr, "type", 0, "", ICON_NONE);
+		box = uiLayoutBox(col);
+		/* first row context info for driver */
+		RNA_pointer_create(ale->id, &RNA_DriverVariable, dvar, &dvar_ptr);
+
+		row = uiLayoutRow(box, 0);
+		block = uiLayoutGetBlock(row);
+		/* variable name */
+		uiItemR(row, &dvar_ptr, "name", 0, "", ICON_NONE);
+
+		/* remove button */
+		uiBlockSetEmboss(block, UI_EMBOSSN);
+		but = uiDefIconBut(block, BUT, B_IPO_DEPCHANGE, ICON_X, 290, 0, UI_UNIT_X, UI_UNIT_Y,
+		                   NULL, 0.0, 0.0, 0.0, 0.0, IFACE_("Delete target variable"));
+		uiButSetFunc(but, driver_delete_var_cb, driver, dvar);
+		uiBlockSetEmboss(block, UI_EMBOSS);
+
+		/* variable type */
+		row = uiLayoutRow(box, 0);
+		uiItemR(row, &dvar_ptr, "type", 0, "", ICON_NONE);
 				
 		/* variable type settings */
-		box= uiLayoutBox(col);
-			/* controls to draw depends on the type of variable */
-			switch (dvar->type) {
-				case DVAR_TYPE_SINGLE_PROP:	/* single property */
-					graph_panel_driverVar__singleProp(box, ale->id, dvar);
-					break;
-				case DVAR_TYPE_ROT_DIFF: /* rotational difference */
-					graph_panel_driverVar__rotDiff(box, ale->id, dvar);
-					break;
-				case DVAR_TYPE_LOC_DIFF: /* location difference */
-					graph_panel_driverVar__locDiff(box, ale->id, dvar);
-					break;
-				case DVAR_TYPE_TRANSFORM_CHAN: /* transform channel */
-					graph_panel_driverVar__transChan(box, ale->id, dvar);
-					break;
-			}
-
-			/* value of variable */
-			if (driver->flag & DRIVER_FLAG_SHOWDEBUG) {
-				char valBuf[32];
-
-				box= uiLayoutBox(col);
-				row= uiLayoutRow(box, 1);
-				uiItemL(row, IFACE_("Value:"), ICON_NONE);
-				
-				BLI_snprintf(valBuf, sizeof(valBuf), "%.3f", dvar->curval);
-				uiItemL(row, valBuf, ICON_NONE);
-			}
+		box = uiLayoutBox(col);
+		/* controls to draw depends on the type of variable */
+		switch (dvar->type) {
+			case DVAR_TYPE_SINGLE_PROP:     /* single property */
+				graph_panel_driverVar__singleProp(box, ale->id, dvar);
+				break;
+			case DVAR_TYPE_ROT_DIFF:     /* rotational difference */
+				graph_panel_driverVar__rotDiff(box, ale->id, dvar);
+				break;
+			case DVAR_TYPE_LOC_DIFF:     /* location difference */
+				graph_panel_driverVar__locDiff(box, ale->id, dvar);
+				break;
+			case DVAR_TYPE_TRANSFORM_CHAN:     /* transform channel */
+				graph_panel_driverVar__transChan(box, ale->id, dvar);
+				break;
+		}
+
+		/* value of variable */
+		if (driver->flag & DRIVER_FLAG_SHOWDEBUG) {
+			char valBuf[32];
+
+			box = uiLayoutBox(col);
+			row = uiLayoutRow(box, 1);
+			uiItemL(row, IFACE_("Value:"), ICON_NONE);
+
+			BLI_snprintf(valBuf, sizeof(valBuf), "%.3f", dvar->curval);
+			uiItemL(row, valBuf, ICON_NONE);
+		}
 	}
 	
 	/* cleanup */
@@ -733,7 +733,7 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
 /* ******************* f-modifiers ******************************** */
 /* all the drawing code is in editors/animation/fmodifier_ui.c */
 
-#define B_FMODIFIER_REDRAW		20
+#define B_FMODIFIER_REDRAW      20
 
 static void do_graph_region_modifier_buttons(bContext *C, void *UNUSED(arg), int event)
 {
@@ -755,27 +755,27 @@ static void graph_panel_modifiers(const bContext *C, Panel *pa)
 	if (!graph_panel_context(C, &ale, &fcu))
 		return;
 	
-	block= uiLayoutGetBlock(pa->layout);
+	block = uiLayoutGetBlock(pa->layout);
 	uiBlockSetHandleFunc(block, do_graph_region_modifier_buttons, NULL);
 	
 	/* 'add modifier' button at top of panel */
 	{
-		row= uiLayoutRow(pa->layout, 0);
-		block= uiLayoutGetBlock(row);
+		row = uiLayoutRow(pa->layout, 0);
+		block = uiLayoutGetBlock(row);
 		
 		// XXX for now, this will be a operator button which calls a 'add modifier' operator
 		uiDefButO(block, BUT, "GRAPH_OT_fmodifier_add", WM_OP_INVOKE_REGION_WIN, IFACE_("Add Modifier"),
 		          10, 0, 150, 20, TIP_("Adds a new F-Curve Modifier for the active F-Curve"));
 		
 		/* copy/paste (as sub-row)*/
-		row= uiLayoutRow(row, 1);
-			uiItemO(row, "", ICON_COPYDOWN, "GRAPH_OT_fmodifier_copy");
-			uiItemO(row, "", ICON_PASTEDOWN, "GRAPH_OT_fmodifier_paste");
+		row = uiLayoutRow(row, 1);
+		uiItemO(row, "", ICON_COPYDOWN, "GRAPH_OT_fmodifier_copy");
+		uiItemO(row, "", ICON_PASTEDOWN, "GRAPH_OT_fmodifier_paste");
 	}
 	
 	/* draw each modifier */
-	for (fcm= fcu->modifiers.first; fcm; fcm= fcm->next) {
-		col= uiLayoutColumn(pa->layout, 1);
+	for (fcm = fcu->modifiers.first; fcm; fcm = fcm->next) {
+		col = uiLayoutColumn(pa->layout, 1);
 		
 		ANIM_uiTemplate_fmodifier_draw(col, ale->id, &fcu->modifiers, fcm);
 	}
@@ -789,47 +789,47 @@ void graph_buttons_register(ARegionType *art)
 {
 	PanelType *pt;
 
-	pt= MEM_callocN(sizeof(PanelType), "spacetype graph panel view");
+	pt = MEM_callocN(sizeof(PanelType), "spacetype graph panel view");
 	strcpy(pt->idname, "GRAPH_PT_view");
 	strcpy(pt->label, N_("View Properties"));
-	pt->draw= graph_panel_view;
+	pt->draw = graph_panel_view;
 	pt->flag |= PNL_DEFAULT_CLOSED;
 	BLI_addtail(&art->paneltypes, pt);
 	
-	pt= MEM_callocN(sizeof(PanelType), "spacetype graph panel properties");
+	pt = MEM_callocN(sizeof(PanelType), "spacetype graph panel properties");
 	strcpy(pt->idname, "GRAPH_PT_properties");
 	strcpy(pt->label, N_("Active F-Curve"));
-	pt->draw= graph_panel_properties;
-	pt->poll= graph_panel_poll;
+	pt->draw = graph_panel_properties;
+	pt->poll = graph_panel_poll;
 	BLI_addtail(&art->paneltypes, pt);
 	
-	pt= MEM_callocN(sizeof(PanelType), "spacetype graph panel properties");
+	pt = MEM_callocN(sizeof(PanelType), "spacetype graph panel properties");
 	strcpy(pt->idname, "GRAPH_PT_key_properties");
 	strcpy(pt->label, N_("Active Keyframe"));
-	pt->draw= graph_panel_key_properties;
-	pt->poll= graph_panel_poll;
+	pt->draw = graph_panel_key_properties;
+	pt->poll = graph_panel_poll;
 	BLI_addtail(&art->paneltypes, pt);
 
 
-	pt= MEM_callocN(sizeof(PanelType), "spacetype graph panel drivers");
+	pt = MEM_callocN(sizeof(PanelType), "spacetype graph panel drivers");
 	strcpy(pt->idname, "GRAPH_PT_drivers");
 	strcpy(pt->label, N_("Drivers"));
-	pt->draw= graph_panel_drivers;
-	pt->poll= graph_panel_drivers_poll;
+	pt->draw = graph_panel_drivers;
+	pt->poll = graph_panel_drivers_poll;
 	BLI_addtail(&art->paneltypes, pt);
 
-	pt= MEM_callocN(sizeof(PanelType), "spacetype graph panel modifiers");
+	pt = MEM_callocN(sizeof(PanelType), "spacetype graph panel modifiers");
 	strcpy(pt->idname, "GRAPH_PT_modifiers");
 	strcpy(pt->label, N_("Modifiers"));
-	pt->draw= graph_panel_modifiers;
-	pt->poll= graph_panel_poll;
+	pt->draw = graph_panel_modifiers;
+	pt->poll = graph_panel_poll;
 	BLI_addtail(&art->paneltypes, pt);
 }
 
 static int graph_properties(bContext *C, wmOperator *UNUSED(op))
 {
-	ScrArea *sa= CTX_wm_area(C);
-	ARegion *ar= graph_has_buttons_region(sa);
+	ScrArea *sa = CTX_wm_area(C);
+	ARegion *ar = graph_has_buttons_region(sa);
 	
 	if (ar)
 		ED_region_toggle_hidden(C, ar);