ClangFormat: apply to source, most of intern

Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat

1 files changed, 1227 insertions, 1168 deletions

diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c
index 6c6c0d451cc..a109282978c 100644
--- a/source/blender/editors/space_graph/graph_select.c
+++ b/source/blender/editors/space_graph/graph_select.c
@@ -20,7 +20,6 @@
  * \ingroup spgraph
  */
 
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
@@ -57,7 +56,6 @@
 
 #include "graph_intern.h"
 
-
 /* ************************************************************************** */
 /* KEYFRAMES STUFF */
 
@@ -80,137 +78,137 @@
  */
 void deselect_graph_keys(bAnimContext *ac, bool test, short sel, bool do_channels)
 {
-	ListBase anim_data = {NULL, NULL};
-	bAnimListElem *ale;
-	int filter;
-
-	SpaceGraph *sipo = (SpaceGraph *)ac->sl;
-	KeyframeEditData ked = {{NULL}};
-	KeyframeEditFunc test_cb, sel_cb;
-
-	/* determine type-based settings */
-	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
-
-	/* filter data */
-	ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
-
-	/* init BezTriple looping data */
-	test_cb = ANIM_editkeyframes_ok(BEZT_OK_SELECTED);
-
-	/* See if we should be selecting or deselecting */
-	if (test) {
-		for (ale = anim_data.first; ale; ale = ale->next) {
-			if (ANIM_fcurve_keyframes_loop(&ked, ale->key_data, NULL, test_cb, NULL)) {
-				sel = SELECT_SUBTRACT;
-				break;
-			}
-		}
-	}
-
-	/* convert sel to selectmode, and use that to get editor */
-	sel_cb = ANIM_editkeyframes_select(sel);
-
-	/* Now set the flags */
-	for (ale = anim_data.first; ale; ale = ale->next) {
-		FCurve *fcu = (FCurve *)ale->key_data;
-
-		/* Keyframes First */
-		ANIM_fcurve_keyframes_loop(&ked, ale->key_data, NULL, sel_cb, NULL);
-
-		/* affect channel selection status? */
-		if (do_channels) {
-			/* only change selection of channel when the visibility of keyframes doesn't depend on this */
-			if ((sipo->flag & SIPO_SELCUVERTSONLY) == 0) {
-				/* deactivate the F-Curve, and deselect if deselecting keyframes.
-				 * otherwise select the F-Curve too since we've selected all the keyframes
-				 */
-				if (sel == SELECT_SUBTRACT)
-					fcu->flag &= ~FCURVE_SELECTED;
-				else
-					fcu->flag |= FCURVE_SELECTED;
-			}
-
-			/* always deactivate all F-Curves if we perform batch ops for selection */
-			fcu->flag &= ~FCURVE_ACTIVE;
-		}
-	}
-
-	/* Cleanup */
-	ANIM_animdata_freelist(&anim_data);
+  ListBase anim_data = {NULL, NULL};
+  bAnimListElem *ale;
+  int filter;
+
+  SpaceGraph *sipo = (SpaceGraph *)ac->sl;
+  KeyframeEditData ked = {{NULL}};
+  KeyframeEditFunc test_cb, sel_cb;
+
+  /* determine type-based settings */
+  filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
+
+  /* filter data */
+  ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
+
+  /* init BezTriple looping data */
+  test_cb = ANIM_editkeyframes_ok(BEZT_OK_SELECTED);
+
+  /* See if we should be selecting or deselecting */
+  if (test) {
+    for (ale = anim_data.first; ale; ale = ale->next) {
+      if (ANIM_fcurve_keyframes_loop(&ked, ale->key_data, NULL, test_cb, NULL)) {
+        sel = SELECT_SUBTRACT;
+        break;
+      }
+    }
+  }
+
+  /* convert sel to selectmode, and use that to get editor */
+  sel_cb = ANIM_editkeyframes_select(sel);
+
+  /* Now set the flags */
+  for (ale = anim_data.first; ale; ale = ale->next) {
+    FCurve *fcu = (FCurve *)ale->key_data;
+
+    /* Keyframes First */
+    ANIM_fcurve_keyframes_loop(&ked, ale->key_data, NULL, sel_cb, NULL);
+
+    /* affect channel selection status? */
+    if (do_channels) {
+      /* only change selection of channel when the visibility of keyframes doesn't depend on this */
+      if ((sipo->flag & SIPO_SELCUVERTSONLY) == 0) {
+        /* deactivate the F-Curve, and deselect if deselecting keyframes.
+         * otherwise select the F-Curve too since we've selected all the keyframes
+         */
+        if (sel == SELECT_SUBTRACT)
+          fcu->flag &= ~FCURVE_SELECTED;
+        else
+          fcu->flag |= FCURVE_SELECTED;
+      }
+
+      /* always deactivate all F-Curves if we perform batch ops for selection */
+      fcu->flag &= ~FCURVE_ACTIVE;
+    }
+  }
+
+  /* Cleanup */
+  ANIM_animdata_freelist(&anim_data);
 }
 
 /* ------------------- */
 
 static int graphkeys_deselectall_exec(bContext *C, wmOperator *op)
 {
-	bAnimContext ac;
-	bAnimListElem *ale_active = NULL;
-
-	/* get editor data */
-	if (ANIM_animdata_get_context(C, &ac) == 0)
-		return OPERATOR_CANCELLED;
-
-	/* find active F-Curve, and preserve this for later
-	 * or else it becomes annoying with the current active
-	 * curve keeps fading out even while you're editing it
-	 */
-	ale_active = get_active_fcurve_channel(&ac);
-
-	/* 'standard' behavior - check if selected, then apply relevant selection */
-	const int action = RNA_enum_get(op->ptr, "action");
-	switch (action) {
-		case SEL_TOGGLE:
-			deselect_graph_keys(&ac, 1, SELECT_ADD, true);
-			break;
-		case SEL_SELECT:
-			deselect_graph_keys(&ac, 0, SELECT_ADD, true);
-			break;
-		case SEL_DESELECT:
-			deselect_graph_keys(&ac, 0, SELECT_SUBTRACT, true);
-			break;
-		case SEL_INVERT:
-			deselect_graph_keys(&ac, 0, SELECT_INVERT, true);
-			break;
-		default:
-			BLI_assert(0);
-			break;
-	}
-
-	/* restore active F-Curve... */
-	if (ale_active) {
-		FCurve *fcu = (FCurve *)ale_active->data;
-
-		/* all others should not be disabled, so we should be able to just set this directly...
-		 * - selection needs to be set too, or else this won't work...
-		 */
-		fcu->flag |= (FCURVE_SELECTED | FCURVE_ACTIVE);
-
-		MEM_freeN(ale_active);
-		ale_active = NULL;
-	}
-
-	/* set notifier that things have changed */
-	WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
-
-	return OPERATOR_FINISHED;
+  bAnimContext ac;
+  bAnimListElem *ale_active = NULL;
+
+  /* get editor data */
+  if (ANIM_animdata_get_context(C, &ac) == 0)
+    return OPERATOR_CANCELLED;
+
+  /* find active F-Curve, and preserve this for later
+   * or else it becomes annoying with the current active
+   * curve keeps fading out even while you're editing it
+   */
+  ale_active = get_active_fcurve_channel(&ac);
+
+  /* 'standard' behavior - check if selected, then apply relevant selection */
+  const int action = RNA_enum_get(op->ptr, "action");
+  switch (action) {
+    case SEL_TOGGLE:
+      deselect_graph_keys(&ac, 1, SELECT_ADD, true);
+      break;
+    case SEL_SELECT:
+      deselect_graph_keys(&ac, 0, SELECT_ADD, true);
+      break;
+    case SEL_DESELECT:
+      deselect_graph_keys(&ac, 0, SELECT_SUBTRACT, true);
+      break;
+    case SEL_INVERT:
+      deselect_graph_keys(&ac, 0, SELECT_INVERT, true);
+      break;
+    default:
+      BLI_assert(0);
+      break;
+  }
+
+  /* restore active F-Curve... */
+  if (ale_active) {
+    FCurve *fcu = (FCurve *)ale_active->data;
+
+    /* all others should not be disabled, so we should be able to just set this directly...
+     * - selection needs to be set too, or else this won't work...
+     */
+    fcu->flag |= (FCURVE_SELECTED | FCURVE_ACTIVE);
+
+    MEM_freeN(ale_active);
+    ale_active = NULL;
+  }
+
+  /* set notifier that things have changed */
+  WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
+
+  return OPERATOR_FINISHED;
 }
 
 void GRAPH_OT_select_all(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "Select All";
-	ot->idname = "GRAPH_OT_select_all";
-	ot->description = "Toggle selection of all keyframes";
+  /* identifiers */
+  ot->name = "Select All";
+  ot->idname = "GRAPH_OT_select_all";
+  ot->description = "Toggle selection of all keyframes";
 
-	/* api callbacks */
-	ot->exec = graphkeys_deselectall_exec;
-	ot->poll = graphop_visible_keyframes_poll;
+  /* api callbacks */
+  ot->exec = graphkeys_deselectall_exec;
+  ot->poll = graphop_visible_keyframes_poll;
 
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-	/* properties */
-	WM_operator_properties_select_all(ot);
+  /* properties */
+  WM_operator_properties_select_all(ot);
 }
 
 /* ******************** Box Select Operator **************************** */
@@ -228,336 +226,341 @@ void GRAPH_OT_select_all(wmOperatorType *ot)
  * this, and allow handles to be considered independently too.
  * Also, for convenience, handles should get same status as keyframe (if it was within bounds).
  */
-static void box_select_graphkeys(
-        bAnimContext *ac, const rctf *rectf_view, short mode, short selectmode, bool incl_handles,
-        void *data)
+static void box_select_graphkeys(bAnimContext *ac,
+                                 const rctf *rectf_view,
+                                 short mode,
+                                 short selectmode,
+                                 bool incl_handles,
+                                 void *data)
 {
-	ListBase anim_data = {NULL, NULL};
-	bAnimListElem *ale;
-	int filter, mapping_flag;
-
-	SpaceGraph *sipo = (SpaceGraph *)ac->sl;
-	KeyframeEditData ked;
-	KeyframeEditFunc ok_cb, select_cb;
-	View2D *v2d = &ac->ar->v2d;
-	rctf rectf, scaled_rectf;
-
-	/* convert mouse coordinates to frame ranges and channel coordinates corrected for view pan/zoom */
-	UI_view2d_region_to_view_rctf(v2d, rectf_view, &rectf);
-
-	/* filter data */
-	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
-	ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
-
-	/* get beztriple editing/validation funcs  */
-	select_cb = ANIM_editkeyframes_select(selectmode);
-	ok_cb = ANIM_editkeyframes_ok(mode);
-
-	/* init editing data */
-	memset(&ked, 0, sizeof(KeyframeEditData));
-	if (mode == BEZT_OK_REGION_LASSO) {
-		KeyframeEdit_LassoData *data_lasso = data;
-		data_lasso->rectf_scaled = &scaled_rectf;
-		ked.data = data_lasso;
-	}
-	else if (mode == BEZT_OK_REGION_CIRCLE) {
-		KeyframeEdit_CircleData *data_circle = data;
-		data_circle->rectf_scaled = &scaled_rectf;
-		ked.data = data;
-	}
-	else {
-		ked.data = &scaled_rectf;
-	}
-
-	/* treat handles separately? */
-	if (incl_handles) {
-		ked.iterflags |= KEYFRAME_ITER_INCL_HANDLES;
-		mapping_flag = 0;
-	}
-	else
-		mapping_flag = ANIM_UNITCONV_ONLYKEYS;
-
-	mapping_flag |= ANIM_get_normalization_flags(ac);
-
-	/* loop over data, doing box select */
-	for (ale = anim_data.first; ale; ale = ale->next) {
-		AnimData *adt = ANIM_nla_mapping_get(ac, ale);
-		FCurve *fcu = (FCurve *)ale->key_data;
-		float offset;
-		float unit_scale = ANIM_unit_mapping_get_factor(ac->scene, ale->id, fcu, mapping_flag, &offset);
-
-		/* apply NLA mapping to all the keyframes, since it's easier than trying to
-		 * guess when a callback might use something different
-		 */
-		if (adt)
-			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, incl_handles == 0);
-
-		scaled_rectf.xmin = rectf.xmin;
-		scaled_rectf.xmax = rectf.xmax;
-		scaled_rectf.ymin = rectf.ymin / unit_scale - offset;
-		scaled_rectf.ymax = rectf.ymax / unit_scale - offset;
-
-		/* set horizontal range (if applicable)
-		 * NOTE: these values are only used for x-range and y-range but not region
-		 *      (which uses ked.data, i.e. rectf)
-		 */
-		if (mode != BEZT_OK_VALUERANGE) {
-			ked.f1 = rectf.xmin;
-			ked.f2 = rectf.xmax;
-		}
-		else {
-			ked.f1 = rectf.ymin;
-			ked.f2 = rectf.ymax;
-		}
-
-		/* firstly, check if any keyframes will be hit by this */
-		if (ANIM_fcurve_keyframes_loop(&ked, fcu, NULL, ok_cb, NULL)) {
-			/* select keyframes that are in the appropriate places */
-			ANIM_fcurve_keyframes_loop(&ked, fcu, ok_cb, select_cb, NULL);
-
-			/* only change selection of channel when the visibility of keyframes doesn't depend on this */
-			if ((sipo->flag & SIPO_SELCUVERTSONLY) == 0) {
-				/* select the curve too now that curve will be touched */
-				if (selectmode == SELECT_ADD)
-					fcu->flag |= FCURVE_SELECTED;
-			}
-		}
-
-		/* un-apply NLA mapping from all the keyframes */
-		if (adt)
-			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, incl_handles == 0);
-	}
-
-	/* cleanup */
-	ANIM_animdata_freelist(&anim_data);
+  ListBase anim_data = {NULL, NULL};
+  bAnimListElem *ale;
+  int filter, mapping_flag;
+
+  SpaceGraph *sipo = (SpaceGraph *)ac->sl;
+  KeyframeEditData ked;
+  KeyframeEditFunc ok_cb, select_cb;
+  View2D *v2d = &ac->ar->v2d;
+  rctf rectf, scaled_rectf;
+
+  /* convert mouse coordinates to frame ranges and channel coordinates corrected for view pan/zoom */
+  UI_view2d_region_to_view_rctf(v2d, rectf_view, &rectf);
+
+  /* filter data */
+  filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
+  ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
+
+  /* get beztriple editing/validation funcs  */
+  select_cb = ANIM_editkeyframes_select(selectmode);
+  ok_cb = ANIM_editkeyframes_ok(mode);
+
+  /* init editing data */
+  memset(&ked, 0, sizeof(KeyframeEditData));
+  if (mode == BEZT_OK_REGION_LASSO) {
+    KeyframeEdit_LassoData *data_lasso = data;
+    data_lasso->rectf_scaled = &scaled_rectf;
+    ked.data = data_lasso;
+  }
+  else if (mode == BEZT_OK_REGION_CIRCLE) {
+    KeyframeEdit_CircleData *data_circle = data;
+    data_circle->rectf_scaled = &scaled_rectf;
+    ked.data = data;
+  }
+  else {
+    ked.data = &scaled_rectf;
+  }
+
+  /* treat handles separately? */
+  if (incl_handles) {
+    ked.iterflags |= KEYFRAME_ITER_INCL_HANDLES;
+    mapping_flag = 0;
+  }
+  else
+    mapping_flag = ANIM_UNITCONV_ONLYKEYS;
+
+  mapping_flag |= ANIM_get_normalization_flags(ac);
+
+  /* loop over data, doing box select */
+  for (ale = anim_data.first; ale; ale = ale->next) {
+    AnimData *adt = ANIM_nla_mapping_get(ac, ale);
+    FCurve *fcu = (FCurve *)ale->key_data;
+    float offset;
+    float unit_scale = ANIM_unit_mapping_get_factor(
+        ac->scene, ale->id, fcu, mapping_flag, &offset);
+
+    /* apply NLA mapping to all the keyframes, since it's easier than trying to
+     * guess when a callback might use something different
+     */
+    if (adt)
+      ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, incl_handles == 0);
+
+    scaled_rectf.xmin = rectf.xmin;
+    scaled_rectf.xmax = rectf.xmax;
+    scaled_rectf.ymin = rectf.ymin / unit_scale - offset;
+    scaled_rectf.ymax = rectf.ymax / unit_scale - offset;
+
+    /* set horizontal range (if applicable)
+     * NOTE: these values are only used for x-range and y-range but not region
+     *      (which uses ked.data, i.e. rectf)
+     */
+    if (mode != BEZT_OK_VALUERANGE) {
+      ked.f1 = rectf.xmin;
+      ked.f2 = rectf.xmax;
+    }
+    else {
+      ked.f1 = rectf.ymin;
+      ked.f2 = rectf.ymax;
+    }
+
+    /* firstly, check if any keyframes will be hit by this */
+    if (ANIM_fcurve_keyframes_loop(&ked, fcu, NULL, ok_cb, NULL)) {
+      /* select keyframes that are in the appropriate places */
+      ANIM_fcurve_keyframes_loop(&ked, fcu, ok_cb, select_cb, NULL);
+
+      /* only change selection of channel when the visibility of keyframes doesn't depend on this */
+      if ((sipo->flag & SIPO_SELCUVERTSONLY) == 0) {
+        /* select the curve too now that curve will be touched */
+        if (selectmode == SELECT_ADD)
+          fcu->flag |= FCURVE_SELECTED;
+      }
+    }
+
+    /* un-apply NLA mapping from all the keyframes */
+    if (adt)
+      ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, incl_handles == 0);
+  }
+
+  /* cleanup */
+  ANIM_animdata_freelist(&anim_data);
 }
 
 /* ------------------- */
 
 static int graphkeys_box_select_exec(bContext *C, wmOperator *op)
 {
-	bAnimContext ac;
-	rcti rect;
-	rctf rect_fl;
-	short mode = 0;
-
-	/* get editor data */
-	if (ANIM_animdata_get_context(C, &ac) == 0)
-		return OPERATOR_CANCELLED;
-
-	const eSelectOp sel_op = RNA_enum_get(op->ptr, "mode");
-	const int selectmode = (sel_op != SEL_OP_SUB) ? SELECT_ADD : SELECT_SUBTRACT;
-	if (SEL_OP_USE_PRE_DESELECT(sel_op)) {
-		deselect_graph_keys(&ac, 1, SELECT_SUBTRACT, true);
-	}
-
-	/* 'include_handles' from the operator specifies whether to include handles in the selection. */
-	const bool incl_handles = RNA_boolean_get(op->ptr, "include_handles");
-
-	/* get settings from operator */
-	WM_operator_properties_border_to_rcti(op, &rect);
-
-	/* selection 'mode' depends on whether box_select region only matters on one axis */
-	if (RNA_boolean_get(op->ptr, "axis_range")) {
-		/* mode depends on which axis of the range is larger to determine which axis to use
-		 * - checking this in region-space is fine, as it's fundamentally still going to be a different rect size
-		 * - the frame-range select option is favored over the channel one (x over y), as frame-range one is often
-		 *   used for tweaking timing when "blocking", while channels is not that useful...
-		 */
-		if ((BLI_rcti_size_x(&rect)) >= (BLI_rcti_size_y(&rect)))
-			mode = BEZT_OK_FRAMERANGE;
-		else
-			mode = BEZT_OK_VALUERANGE;
-	}
-	else
-		mode = BEZT_OK_REGION;
-
-	BLI_rctf_rcti_copy(&rect_fl, &rect);
-
-	/* apply box_select action */
-	box_select_graphkeys(&ac, &rect_fl, mode, selectmode, incl_handles, NULL);
-
-	/* send notifier that keyframe selection has changed */
-	WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
-
-	return OPERATOR_FINISHED;
+  bAnimContext ac;
+  rcti rect;
+  rctf rect_fl;
+  short mode = 0;
+
+  /* get editor data */
+  if (ANIM_animdata_get_context(C, &ac) == 0)
+    return OPERATOR_CANCELLED;
+
+  const eSelectOp sel_op = RNA_enum_get(op->ptr, "mode");
+  const int selectmode = (sel_op != SEL_OP_SUB) ? SELECT_ADD : SELECT_SUBTRACT;
+  if (SEL_OP_USE_PRE_DESELECT(sel_op)) {
+    deselect_graph_keys(&ac, 1, SELECT_SUBTRACT, true);
+  }
+
+  /* 'include_handles' from the operator specifies whether to include handles in the selection. */
+  const bool incl_handles = RNA_boolean_get(op->ptr, "include_handles");
+
+  /* get settings from operator */
+  WM_operator_properties_border_to_rcti(op, &rect);
+
+  /* selection 'mode' depends on whether box_select region only matters on one axis */
+  if (RNA_boolean_get(op->ptr, "axis_range")) {
+    /* mode depends on which axis of the range is larger to determine which axis to use
+     * - checking this in region-space is fine, as it's fundamentally still going to be a different rect size
+     * - the frame-range select option is favored over the channel one (x over y), as frame-range one is often
+     *   used for tweaking timing when "blocking", while channels is not that useful...
+     */
+    if ((BLI_rcti_size_x(&rect)) >= (BLI_rcti_size_y(&rect)))
+      mode = BEZT_OK_FRAMERANGE;
+    else
+      mode = BEZT_OK_VALUERANGE;
+  }
+  else
+    mode = BEZT_OK_REGION;
+
+  BLI_rctf_rcti_copy(&rect_fl, &rect);
+
+  /* apply box_select action */
+  box_select_graphkeys(&ac, &rect_fl, mode, selectmode, incl_handles, NULL);
+
+  /* send notifier that keyframe selection has changed */
+  WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
+
+  return OPERATOR_FINISHED;
 }
 
 void GRAPH_OT_select_box(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "Box Select";
-	ot->idname = "GRAPH_OT_select_box";
-	ot->description = "Select all keyframes within the specified region";
-
-	/* api callbacks */
-	ot->invoke = WM_gesture_box_invoke;
-	ot->exec = graphkeys_box_select_exec;
-	ot->modal = WM_gesture_box_modal;
-	ot->cancel = WM_gesture_box_cancel;
-
-	ot->poll = graphop_visible_keyframes_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	/* properties */
-	ot->prop = RNA_def_boolean(ot->srna, "axis_range", 0, "Axis Range", "");
-	RNA_def_boolean(ot->srna, "include_handles", 0, "Include Handles", "Are handles tested individually against the selection criteria");
-
-	WM_operator_properties_gesture_box(ot);
-	WM_operator_properties_select_operation_simple(ot);
+  /* identifiers */
+  ot->name = "Box Select";
+  ot->idname = "GRAPH_OT_select_box";
+  ot->description = "Select all keyframes within the specified region";
+
+  /* api callbacks */
+  ot->invoke = WM_gesture_box_invoke;
+  ot->exec = graphkeys_box_select_exec;
+  ot->modal = WM_gesture_box_modal;
+  ot->cancel = WM_gesture_box_cancel;
+
+  ot->poll = graphop_visible_keyframes_poll;
+
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+  /* properties */
+  ot->prop = RNA_def_boolean(ot->srna, "axis_range", 0, "Axis Range", "");
+  RNA_def_boolean(ot->srna,
+                  "include_handles",
+                  0,
+                  "Include Handles",
+                  "Are handles tested individually against the selection criteria");
+
+  WM_operator_properties_gesture_box(ot);
+  WM_operator_properties_select_operation_simple(ot);
 }
 
-
 /* ------------------- */
 
 static int graphkeys_lassoselect_exec(bContext *C, wmOperator *op)
 {
-	bAnimContext ac;
+  bAnimContext ac;
 
-	KeyframeEdit_LassoData data_lasso = {0};
-	rcti rect;
-	rctf rect_fl;
+  KeyframeEdit_LassoData data_lasso = {0};
+  rcti rect;
+  rctf rect_fl;
 
-	bool incl_handles;
+  bool incl_handles;
 
-	/* get editor data */
-	if (ANIM_animdata_get_context(C, &ac) == 0)
-		return OPERATOR_CANCELLED;
+  /* get editor data */
+  if (ANIM_animdata_get_context(C, &ac) == 0)
+    return OPERATOR_CANCELLED;
 
-	data_lasso.rectf_view = &rect_fl;
-	data_lasso.mcords = WM_gesture_lasso_path_to_array(C, op, &data_lasso.mcords_tot);
-	if (data_lasso.mcords == NULL)
-		return OPERATOR_CANCELLED;
+  data_lasso.rectf_view = &rect_fl;
+  data_lasso.mcords = WM_gesture_lasso_path_to_array(C, op, &data_lasso.mcords_tot);
+  if (data_lasso.mcords == NULL)
+    return OPERATOR_CANCELLED;
 
-	const eSelectOp sel_op = RNA_enum_get(op->ptr, "mode");
-	const short selectmode = (sel_op != SEL_OP_SUB) ? SELECT_ADD : SELECT_SUBTRACT;
-	if (SEL_OP_USE_PRE_DESELECT(sel_op)) {
-		deselect_graph_keys(&ac, 0, SELECT_SUBTRACT, true);
-	}
+  const eSelectOp sel_op = RNA_enum_get(op->ptr, "mode");
+  const short selectmode = (sel_op != SEL_OP_SUB) ? SELECT_ADD : SELECT_SUBTRACT;
+  if (SEL_OP_USE_PRE_DESELECT(sel_op)) {
+    deselect_graph_keys(&ac, 0, SELECT_SUBTRACT, true);
+  }
 
-	{
-		SpaceGraph *sipo = (SpaceGraph *)ac.sl;
-		if (selectmode == SELECT_ADD) {
-			incl_handles = ((sipo->flag & SIPO_SELVHANDLESONLY) ||
-			                (sipo->flag & SIPO_NOHANDLES)) == 0;
-		}
-		else {
-			incl_handles = (sipo->flag & SIPO_NOHANDLES) == 0;
-		}
-	}
+  {
+    SpaceGraph *sipo = (SpaceGraph *)ac.sl;
+    if (selectmode == SELECT_ADD) {
+      incl_handles = ((sipo->flag & SIPO_SELVHANDLESONLY) || (sipo->flag & SIPO_NOHANDLES)) == 0;
+    }
+    else {
+      incl_handles = (sipo->flag & SIPO_NOHANDLES) == 0;
+    }
+  }
 
-	/* get settings from operator */
-	BLI_lasso_boundbox(&rect, data_lasso.mcords, data_lasso.mcords_tot);
-	BLI_rctf_rcti_copy(&rect_fl, &rect);
+  /* get settings from operator */
+  BLI_lasso_boundbox(&rect, data_lasso.mcords, data_lasso.mcords_tot);
+  BLI_rctf_rcti_copy(&rect_fl, &rect);
 
-	/* apply box_select action */
-	box_select_graphkeys(&ac, &rect_fl, BEZT_OK_REGION_LASSO, selectmode, incl_handles, &data_lasso);
+  /* apply box_select action */
+  box_select_graphkeys(&ac, &rect_fl, BEZT_OK_REGION_LASSO, selectmode, incl_handles, &data_lasso);
 
-	MEM_freeN((void *)data_lasso.mcords);
+  MEM_freeN((void *)data_lasso.mcords);
 
-	/* send notifier that keyframe selection has changed */
-	WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
+  /* send notifier that keyframe selection has changed */
+  WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
 
-	return OPERATOR_FINISHED;
+  return OPERATOR_FINISHED;
 }
 
 void GRAPH_OT_select_lasso(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "Lasso Select";
-	ot->description = "Select keyframe points using lasso selection";
-	ot->idname = "GRAPH_OT_select_lasso";
-
-	/* api callbacks */
-	ot->invoke = WM_gesture_lasso_invoke;
-	ot->modal = WM_gesture_lasso_modal;
-	ot->exec = graphkeys_lassoselect_exec;
-	ot->poll = graphop_visible_keyframes_poll;
-	ot->cancel = WM_gesture_lasso_cancel;
-
-	/* flags */
-	ot->flag = OPTYPE_UNDO;
-
-	/* properties */
-	WM_operator_properties_gesture_lasso(ot);
-	WM_operator_properties_select_operation_simple(ot);
+  /* identifiers */
+  ot->name = "Lasso Select";
+  ot->description = "Select keyframe points using lasso selection";
+  ot->idname = "GRAPH_OT_select_lasso";
+
+  /* api callbacks */
+  ot->invoke = WM_gesture_lasso_invoke;
+  ot->modal = WM_gesture_lasso_modal;
+  ot->exec = graphkeys_lassoselect_exec;
+  ot->poll = graphop_visible_keyframes_poll;
+  ot->cancel = WM_gesture_lasso_cancel;
+
+  /* flags */
+  ot->flag = OPTYPE_UNDO;
+
+  /* properties */
+  WM_operator_properties_gesture_lasso(ot);
+  WM_operator_properties_select_operation_simple(ot);
 }
 
 /* ------------------- */
 
 static int graph_circle_select_exec(bContext *C, wmOperator *op)
 {
-	bAnimContext ac;
-	bool incl_handles = false;
-
-	KeyframeEdit_CircleData data = {0};
-	rctf rect_fl;
-
-	float x = RNA_int_get(op->ptr, "x");
-	float y = RNA_int_get(op->ptr, "y");
-	float radius = RNA_int_get(op->ptr, "radius");
-
-	/* get editor data */
-	if (ANIM_animdata_get_context(C, &ac) == 0)
-		return OPERATOR_CANCELLED;
-
-	const eSelectOp sel_op = ED_select_op_modal(
-	        RNA_enum_get(op->ptr, "mode"), WM_gesture_is_modal_first(op->customdata));
-	const short selectmode = (sel_op != SEL_OP_SUB) ? SELECT_ADD : SELECT_SUBTRACT;
-	if (SEL_OP_USE_PRE_DESELECT(sel_op)) {
-		deselect_graph_keys(&ac, 0, SELECT_SUBTRACT, true);
-	}
-
-	data.mval[0] = x;
-	data.mval[1] = y;
-	data.radius_squared = radius * radius;
-	data.rectf_view = &rect_fl;
-
-	rect_fl.xmin = x - radius;
-	rect_fl.xmax = x + radius;
-	rect_fl.ymin = y - radius;
-	rect_fl.ymax = y + radius;
-
-	{
-		SpaceGraph *sipo = (SpaceGraph *)ac.sl;
-		if (selectmode == SELECT_ADD) {
-			incl_handles = ((sipo->flag & SIPO_SELVHANDLESONLY) ||
-			                (sipo->flag & SIPO_NOHANDLES)) == 0;
-		}
-		else {
-			incl_handles = (sipo->flag & SIPO_NOHANDLES) == 0;
-		}
-	}
-
-	/* apply box_select action */
-	box_select_graphkeys(&ac, &rect_fl, BEZT_OK_REGION_CIRCLE, selectmode, incl_handles, &data);
-
-	/* send notifier that keyframe selection has changed */
-	WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
-
-	return OPERATOR_FINISHED;
+  bAnimContext ac;
+  bool incl_handles = false;
+
+  KeyframeEdit_CircleData data = {0};
+  rctf rect_fl;
+
+  float x = RNA_int_get(op->ptr, "x");
+  float y = RNA_int_get(op->ptr, "y");
+  float radius = RNA_int_get(op->ptr, "radius");
+
+  /* get editor data */
+  if (ANIM_animdata_get_context(C, &ac) == 0)
+    return OPERATOR_CANCELLED;
+
+  const eSelectOp sel_op = ED_select_op_modal(RNA_enum_get(op->ptr, "mode"),
+                                              WM_gesture_is_modal_first(op->customdata));
+  const short selectmode = (sel_op != SEL_OP_SUB) ? SELECT_ADD : SELECT_SUBTRACT;
+  if (SEL_OP_USE_PRE_DESELECT(sel_op)) {
+    deselect_graph_keys(&ac, 0, SELECT_SUBTRACT, true);
+  }
+
+  data.mval[0] = x;
+  data.mval[1] = y;
+  data.radius_squared = radius * radius;
+  data.rectf_view = &rect_fl;
+
+  rect_fl.xmin = x - radius;
+  rect_fl.xmax = x + radius;
+  rect_fl.ymin = y - radius;
+  rect_fl.ymax = y + radius;
+
+  {
+    SpaceGraph *sipo = (SpaceGraph *)ac.sl;
+    if (selectmode == SELECT_ADD) {
+      incl_handles = ((sipo->flag & SIPO_SELVHANDLESONLY) || (sipo->flag & SIPO_NOHANDLES)) == 0;
+    }
+    else {
+      incl_handles = (sipo->flag & SIPO_NOHANDLES) == 0;
+    }
+  }
+
+  /* apply box_select action */
+  box_select_graphkeys(&ac, &rect_fl, BEZT_OK_REGION_CIRCLE, selectmode, incl_handles, &data);
+
+  /* send notifier that keyframe selection has changed */
+  WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
+
+  return OPERATOR_FINISHED;
 }
 
 void GRAPH_OT_select_circle(wmOperatorType *ot)
 {
-	ot->name = "Circle Select";
-	ot->description = "Select keyframe points using circle selection";
-	ot->idname = "GRAPH_OT_select_circle";
-
-	ot->invoke = WM_gesture_circle_invoke;
-	ot->modal = WM_gesture_circle_modal;
-	ot->exec = graph_circle_select_exec;
-	ot->poll = graphop_visible_keyframes_poll;
-	ot->cancel = WM_gesture_circle_cancel;
-
-	/* flags */
-	ot->flag = OPTYPE_UNDO;
-
-	/* properties */
-	WM_operator_properties_gesture_circle(ot);
-	WM_operator_properties_select_operation_simple(ot);
+  ot->name = "Circle Select";
+  ot->description = "Select keyframe points using circle selection";
+  ot->idname = "GRAPH_OT_select_circle";
+
+  ot->invoke = WM_gesture_circle_invoke;
+  ot->modal = WM_gesture_circle_modal;
+  ot->exec = graph_circle_select_exec;
+  ot->poll = graphop_visible_keyframes_poll;
+  ot->cancel = WM_gesture_circle_cancel;
+
+  /* flags */
+  ot->flag = OPTYPE_UNDO;
+
+  /* properties */
+  WM_operator_properties_gesture_circle(ot);
+  WM_operator_properties_select_operation_simple(ot);
 }
 
 /* ******************** Column Select Operator **************************** */
@@ -570,11 +573,15 @@ void GRAPH_OT_select_circle(wmOperatorType *ot)
 
 /* defines for column-select mode */
 static const EnumPropertyItem prop_column_select_types[] = {
-	{GRAPHKEYS_COLUMNSEL_KEYS, "KEYS", 0, "On Selected Keyframes", ""},
-	{GRAPHKEYS_COLUMNSEL_CFRA, "CFRA", 0, "On Current Frame", ""},
-	{GRAPHKEYS_COLUMNSEL_MARKERS_COLUMN, "MARKERS_COLUMN", 0, "On Selected Markers", ""},
-	{GRAPHKEYS_COLUMNSEL_MARKERS_BETWEEN, "MARKERS_BETWEEN", 0, "Between Min/Max Selected Markers", ""},
-	{0, NULL, 0, NULL, NULL},
+    {GRAPHKEYS_COLUMNSEL_KEYS, "KEYS", 0, "On Selected Keyframes", ""},
+    {GRAPHKEYS_COLUMNSEL_CFRA, "CFRA", 0, "On Current Frame", ""},
+    {GRAPHKEYS_COLUMNSEL_MARKERS_COLUMN, "MARKERS_COLUMN", 0, "On Selected Markers", ""},
+    {GRAPHKEYS_COLUMNSEL_MARKERS_BETWEEN,
+     "MARKERS_BETWEEN",
+     0,
+     "Between Min/Max Selected Markers",
+     ""},
+    {0, NULL, 0, NULL, NULL},
 };
 
 /* ------------------- */
@@ -584,218 +591,217 @@ static const EnumPropertyItem prop_column_select_types[] = {
  * should de-duplicate - campbell */
 static void markers_selectkeys_between(bAnimContext *ac)
 {
-	ListBase anim_data = {NULL, NULL};
-	bAnimListElem *ale;
-	int filter;
-
-	KeyframeEditFunc ok_cb, select_cb;
-	KeyframeEditData ked = {{NULL}};
-	float min, max;
-
-	/* get extreme markers */
-	ED_markers_get_minmax(ac->markers, 1, &min, &max);
-	min -= 0.5f;
-	max += 0.5f;
-
-	/* get editing funcs + data */
-	ok_cb = ANIM_editkeyframes_ok(BEZT_OK_FRAMERANGE);
-	select_cb = ANIM_editkeyframes_select(SELECT_ADD);
-
-	ked.f1 = min;
-	ked.f2 = max;
-
-	/* filter data */
-	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
-	ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
-
-	/* select keys in-between */
-	for (ale = anim_data.first; ale; ale = ale->next) {
-		AnimData *adt = ANIM_nla_mapping_get(ac, ale);
-
-		if (adt) {
-			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 1);
-			ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
-			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 1);
-		}
-		else {
-			ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
-		}
-	}
-
-	/* Cleanup */
-	ANIM_animdata_freelist(&anim_data);
+  ListBase anim_data = {NULL, NULL};
+  bAnimListElem *ale;
+  int filter;
+
+  KeyframeEditFunc ok_cb, select_cb;
+  KeyframeEditData ked = {{NULL}};
+  float min, max;
+
+  /* get extreme markers */
+  ED_markers_get_minmax(ac->markers, 1, &min, &max);
+  min -= 0.5f;
+  max += 0.5f;
+
+  /* get editing funcs + data */
+  ok_cb = ANIM_editkeyframes_ok(BEZT_OK_FRAMERANGE);
+  select_cb = ANIM_editkeyframes_select(SELECT_ADD);
+
+  ked.f1 = min;
+  ked.f2 = max;
+
+  /* filter data */
+  filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
+  ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
+
+  /* select keys in-between */
+  for (ale = anim_data.first; ale; ale = ale->next) {
+    AnimData *adt = ANIM_nla_mapping_get(ac, ale);
+
+    if (adt) {
+      ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 1);
+      ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
+      ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 1);
+    }
+    else {
+      ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
+    }
+  }
+
+  /* Cleanup */
+  ANIM_animdata_freelist(&anim_data);
 }
 
-
 /* Selects all visible keyframes in the same frames as the specified elements */
 static void columnselect_graph_keys(bAnimContext *ac, short mode)
 {
-	ListBase anim_data = {NULL, NULL};
-	bAnimListElem *ale;
-	int filter;
-
-	Scene *scene = ac->scene;
-	CfraElem *ce;
-	KeyframeEditFunc select_cb, ok_cb;
-	KeyframeEditData ked;
-
-	/* initialize keyframe editing data */
-	memset(&ked, 0, sizeof(KeyframeEditData));
-
-	/* build list of columns */
-	switch (mode) {
-		case GRAPHKEYS_COLUMNSEL_KEYS: /* list of selected keys */
-			filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
-			ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
-
-			for (ale = anim_data.first; ale; ale = ale->next)
-				ANIM_fcurve_keyframes_loop(&ked, ale->key_data, NULL, bezt_to_cfraelem, NULL);
-
-			ANIM_animdata_freelist(&anim_data);
-			break;
-
-		case GRAPHKEYS_COLUMNSEL_CFRA: /* current frame */
-			/* make a single CfraElem for storing this */
-			ce = MEM_callocN(sizeof(CfraElem), "cfraElem");
-			BLI_addtail(&ked.list, ce);
-
-			ce->cfra = (float)CFRA;
-			break;
-
-		case GRAPHKEYS_COLUMNSEL_MARKERS_COLUMN: /* list of selected markers */
-			ED_markers_make_cfra_list(ac->markers, &ked.list, SELECT);
-			break;
-
-		default: /* invalid option */
-			return;
-	}
-
-	/* set up BezTriple edit callbacks */
-	select_cb = ANIM_editkeyframes_select(SELECT_ADD);
-	ok_cb = ANIM_editkeyframes_ok(BEZT_OK_FRAME);
-
-	/* loop through all of the keys and select additional keyframes
-	 * based on the keys found to be selected above
-	 */
-	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
-	ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
-
-	for (ale = anim_data.first; ale; ale = ale->next) {
-		AnimData *adt = ANIM_nla_mapping_get(ac, ale);
-
-		/* loop over cfraelems (stored in the KeyframeEditData->list)
-		 * - we need to do this here, as we can apply fewer NLA-mapping conversions
-		 */
-		for (ce = ked.list.first; ce; ce = ce->next) {
-			/* set frame for validation callback to refer to */
-			ked.f1 = BKE_nla_tweakedit_remap(adt, ce->cfra, NLATIME_CONVERT_UNMAP);
-
-			/* select elements with frame number matching cfraelem */
-			ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
-		}
-	}
-
-	/* free elements */
-	BLI_freelistN(&ked.list);
-	ANIM_animdata_freelist(&anim_data);
+  ListBase anim_data = {NULL, NULL};
+  bAnimListElem *ale;
+  int filter;
+
+  Scene *scene = ac->scene;
+  CfraElem *ce;
+  KeyframeEditFunc select_cb, ok_cb;
+  KeyframeEditData ked;
+
+  /* initialize keyframe editing data */
+  memset(&ked, 0, sizeof(KeyframeEditData));
+
+  /* build list of columns */
+  switch (mode) {
+    case GRAPHKEYS_COLUMNSEL_KEYS: /* list of selected keys */
+      filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
+      ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
+
+      for (ale = anim_data.first; ale; ale = ale->next)
+        ANIM_fcurve_keyframes_loop(&ked, ale->key_data, NULL, bezt_to_cfraelem, NULL);
+
+      ANIM_animdata_freelist(&anim_data);
+      break;
+
+    case GRAPHKEYS_COLUMNSEL_CFRA: /* current frame */
+      /* make a single CfraElem for storing this */
+      ce = MEM_callocN(sizeof(CfraElem), "cfraElem");
+      BLI_addtail(&ked.list, ce);
+
+      ce->cfra = (float)CFRA;
+      break;
+
+    case GRAPHKEYS_COLUMNSEL_MARKERS_COLUMN: /* list of selected markers */
+      ED_markers_make_cfra_list(ac->markers, &ked.list, SELECT);
+      break;
+
+    default: /* invalid option */
+      return;
+  }
+
+  /* set up BezTriple edit callbacks */
+  select_cb = ANIM_editkeyframes_select(SELECT_ADD);
+  ok_cb = ANIM_editkeyframes_ok(BEZT_OK_FRAME);
+
+  /* loop through all of the keys and select additional keyframes
+   * based on the keys found to be selected above
+   */
+  filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
+  ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
+
+  for (ale = anim_data.first; ale; ale = ale->next) {
+    AnimData *adt = ANIM_nla_mapping_get(ac, ale);
+
+    /* loop over cfraelems (stored in the KeyframeEditData->list)
+     * - we need to do this here, as we can apply fewer NLA-mapping conversions
+     */
+    for (ce = ked.list.first; ce; ce = ce->next) {
+      /* set frame for validation callback to refer to */
+      ked.f1 = BKE_nla_tweakedit_remap(adt, ce->cfra, NLATIME_CONVERT_UNMAP);
+
+      /* select elements with frame number matching cfraelem */
+      ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
+    }
+  }
+
+  /* free elements */
+  BLI_freelistN(&ked.list);
+  ANIM_animdata_freelist(&anim_data);
 }
 
 /* ------------------- */
 
 static int graphkeys_columnselect_exec(bContext *C, wmOperator *op)
 {
-	bAnimContext ac;
-	short mode;
+  bAnimContext ac;
+  short mode;
 
-	/* get editor data */
-	if (ANIM_animdata_get_context(C, &ac) == 0)
-		return OPERATOR_CANCELLED;
+  /* get editor data */
+  if (ANIM_animdata_get_context(C, &ac) == 0)
+    return OPERATOR_CANCELLED;
 
-	/* action to take depends on the mode */
-	mode = RNA_enum_get(op->ptr, "mode");
+  /* action to take depends on the mode */
+  mode = RNA_enum_get(op->ptr, "mode");
 
-	if (mode == GRAPHKEYS_COLUMNSEL_MARKERS_BETWEEN)
-		markers_selectkeys_between(&ac);
-	else
-		columnselect_graph_keys(&ac, mode);
+  if (mode == GRAPHKEYS_COLUMNSEL_MARKERS_BETWEEN)
+    markers_selectkeys_between(&ac);
+  else
+    columnselect_graph_keys(&ac, mode);
 
-	/* set notifier that keyframe selection has changed */
-	WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
+  /* set notifier that keyframe selection has changed */
+  WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
 
-	return OPERATOR_FINISHED;
+  return OPERATOR_FINISHED;
 }
 
 void GRAPH_OT_select_column(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "Select All";
-	ot->idname = "GRAPH_OT_select_column";
-	ot->description = "Select all keyframes on the specified frame(s)";
+  /* identifiers */
+  ot->name = "Select All";
+  ot->idname = "GRAPH_OT_select_column";
+  ot->description = "Select all keyframes on the specified frame(s)";
 
-	/* api callbacks */
-	ot->exec = graphkeys_columnselect_exec;
-	ot->poll = graphop_visible_keyframes_poll;
+  /* api callbacks */
+  ot->exec = graphkeys_columnselect_exec;
+  ot->poll = graphop_visible_keyframes_poll;
 
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-	/* props */
-	ot->prop = RNA_def_enum(ot->srna, "mode", prop_column_select_types, 0, "Mode", "");
+  /* props */
+  ot->prop = RNA_def_enum(ot->srna, "mode", prop_column_select_types, 0, "Mode", "");
 }
 
 /* ******************** Select Linked Operator *********************** */
 
 static int graphkeys_select_linked_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	bAnimContext ac;
+  bAnimContext ac;
 
-	ListBase anim_data = {NULL, NULL};
-	bAnimListElem *ale;
-	int filter;
+  ListBase anim_data = {NULL, NULL};
+  bAnimListElem *ale;
+  int filter;
 
-	KeyframeEditFunc ok_cb = ANIM_editkeyframes_ok(BEZT_OK_SELECTED);
-	KeyframeEditFunc sel_cb = ANIM_editkeyframes_select(SELECT_ADD);
+  KeyframeEditFunc ok_cb = ANIM_editkeyframes_ok(BEZT_OK_SELECTED);
+  KeyframeEditFunc sel_cb = ANIM_editkeyframes_select(SELECT_ADD);
 
-	/* get editor data */
-	if (ANIM_animdata_get_context(C, &ac) == 0)
-		return OPERATOR_CANCELLED;
+  /* get editor data */
+  if (ANIM_animdata_get_context(C, &ac) == 0)
+    return OPERATOR_CANCELLED;
 
-	/* loop through all of the keys and select additional keyframes based on these */
-	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
-	ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
+  /* loop through all of the keys and select additional keyframes based on these */
+  filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
+  ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
 
-	for (ale = anim_data.first; ale; ale = ale->next) {
-		FCurve *fcu = (FCurve *)ale->key_data;
+  for (ale = anim_data.first; ale; ale = ale->next) {
+    FCurve *fcu = (FCurve *)ale->key_data;
 
-		/* check if anything selected? */
-		if (ANIM_fcurve_keyframes_loop(NULL, fcu, NULL, ok_cb, NULL)) {
-			/* select every keyframe in this curve then */
-			ANIM_fcurve_keyframes_loop(NULL, fcu, NULL, sel_cb, NULL);
-		}
-	}
+    /* check if anything selected? */
+    if (ANIM_fcurve_keyframes_loop(NULL, fcu, NULL, ok_cb, NULL)) {
+      /* select every keyframe in this curve then */
+      ANIM_fcurve_keyframes_loop(NULL, fcu, NULL, sel_cb, NULL);
+    }
+  }
 
-	/* Cleanup */
-	ANIM_animdata_freelist(&anim_data);
+  /* Cleanup */
+  ANIM_animdata_freelist(&anim_data);
 
-	/* set notifier that keyframe selection has changed */
-	WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
+  /* set notifier that keyframe selection has changed */
+  WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
 
-	return OPERATOR_FINISHED;
+  return OPERATOR_FINISHED;
 }
 
 void GRAPH_OT_select_linked(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "Select Linked";
-	ot->idname = "GRAPH_OT_select_linked";
-	ot->description = "Select keyframes occurring in the same F-Curves as selected ones";
+  /* identifiers */
+  ot->name = "Select Linked";
+  ot->idname = "GRAPH_OT_select_linked";
+  ot->description = "Select keyframes occurring in the same F-Curves as selected ones";
 
-	/* api callbacks */
-	ot->exec = graphkeys_select_linked_exec;
-	ot->poll = graphop_visible_keyframes_poll;
+  /* api callbacks */
+  ot->exec = graphkeys_select_linked_exec;
+  ot->poll = graphop_visible_keyframes_poll;
 
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
 /* ******************** Select More/Less Operators *********************** */
@@ -803,111 +809,110 @@ void GRAPH_OT_select_linked(wmOperatorType *ot)
 /* Common code to perform selection */
 static void select_moreless_graph_keys(bAnimContext *ac, short mode)
 {
-	ListBase anim_data = {NULL, NULL};
-	bAnimListElem *ale;
-	int filter;
-
-	KeyframeEditData ked;
-	KeyframeEditFunc build_cb;
+  ListBase anim_data = {NULL, NULL};
+  bAnimListElem *ale;
+  int filter;
 
+  KeyframeEditData ked;
+  KeyframeEditFunc build_cb;
 
-	/* init selmap building data */
-	build_cb = ANIM_editkeyframes_buildselmap(mode);
-	memset(&ked, 0, sizeof(KeyframeEditData));
+  /* init selmap building data */
+  build_cb = ANIM_editkeyframes_buildselmap(mode);
+  memset(&ked, 0, sizeof(KeyframeEditData));
 
-	/* loop through all of the keys and select additional keyframes based on these */
-	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
-	ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
+  /* loop through all of the keys and select additional keyframes based on these */
+  filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
+  ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
 
-	for (ale = anim_data.first; ale; ale = ale->next) {
-		FCurve *fcu = (FCurve *)ale->key_data;
+  for (ale = anim_data.first; ale; ale = ale->next) {
+    FCurve *fcu = (FCurve *)ale->key_data;
 
-		/* only continue if F-Curve has keyframes */
-		if (fcu->bezt == NULL)
-			continue;
+    /* only continue if F-Curve has keyframes */
+    if (fcu->bezt == NULL)
+      continue;
 
-		/* build up map of whether F-Curve's keyframes should be selected or not */
-		ked.data = MEM_callocN(fcu->totvert, "selmap graphEdit");
-		ANIM_fcurve_keyframes_loop(&ked, fcu, NULL, build_cb, NULL);
+    /* build up map of whether F-Curve's keyframes should be selected or not */
+    ked.data = MEM_callocN(fcu->totvert, "selmap graphEdit");
+    ANIM_fcurve_keyframes_loop(&ked, fcu, NULL, build_cb, NULL);
 
-		/* based on this map, adjust the selection status of the keyframes */
-		ANIM_fcurve_keyframes_loop(&ked, fcu, NULL, bezt_selmap_flush, NULL);
+    /* based on this map, adjust the selection status of the keyframes */
+    ANIM_fcurve_keyframes_loop(&ked, fcu, NULL, bezt_selmap_flush, NULL);
 
-		/* free the selmap used here */
-		MEM_freeN(ked.data);
-		ked.data = NULL;
-	}
+    /* free the selmap used here */
+    MEM_freeN(ked.data);
+    ked.data = NULL;
+  }
 
-	/* Cleanup */
-	ANIM_animdata_freelist(&anim_data);
+  /* Cleanup */
+  ANIM_animdata_freelist(&anim_data);
 }
 
 /* ----------------- */
 
 static int graphkeys_select_more_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	bAnimContext ac;
+  bAnimContext ac;
 
-	/* get editor data */
-	if (ANIM_animdata_get_context(C, &ac) == 0)
-		return OPERATOR_CANCELLED;
+  /* get editor data */
+  if (ANIM_animdata_get_context(C, &ac) == 0)
+    return OPERATOR_CANCELLED;
 
-	/* perform select changes */
-	select_moreless_graph_keys(&ac, SELMAP_MORE);
+  /* perform select changes */
+  select_moreless_graph_keys(&ac, SELMAP_MORE);
 
-	/* set notifier that keyframe selection has changed */
-	WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
+  /* set notifier that keyframe selection has changed */
+  WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
 
-	return OPERATOR_FINISHED;
+  return OPERATOR_FINISHED;
 }
 
 void GRAPH_OT_select_more(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "Select More";
-	ot->idname = "GRAPH_OT_select_more";
-	ot->description = "Select keyframes beside already selected ones";
+  /* identifiers */
+  ot->name = "Select More";
+  ot->idname = "GRAPH_OT_select_more";
+  ot->description = "Select keyframes beside already selected ones";
 
-	/* api callbacks */
-	ot->exec = graphkeys_select_more_exec;
-	ot->poll = graphop_visible_keyframes_poll;
+  /* api callbacks */
+  ot->exec = graphkeys_select_more_exec;
+  ot->poll = graphop_visible_keyframes_poll;
 
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
 /* ----------------- */
 
 static int graphkeys_select_less_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	bAnimContext ac;
+  bAnimContext ac;
 
-	/* get editor data */
-	if (ANIM_animdata_get_context(C, &ac) == 0)
-		return OPERATOR_CANCELLED;
+  /* get editor data */
+  if (ANIM_animdata_get_context(C, &ac) == 0)
+    return OPERATOR_CANCELLED;
 
-	/* perform select changes */
-	select_moreless_graph_keys(&ac, SELMAP_LESS);
+  /* perform select changes */
+  select_moreless_graph_keys(&ac, SELMAP_LESS);
 
-	/* set notifier that keyframe selection has changed */
-	WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
+  /* set notifier that keyframe selection has changed */
+  WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
 
-	return OPERATOR_FINISHED;
+  return OPERATOR_FINISHED;
 }
 
 void GRAPH_OT_select_less(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "Select Less";
-	ot->idname = "GRAPH_OT_select_less";
-	ot->description = "Deselect keyframes on ends of selection islands";
+  /* identifiers */
+  ot->name = "Select Less";
+  ot->idname = "GRAPH_OT_select_less";
+  ot->description = "Deselect keyframes on ends of selection islands";
 
-	/* api callbacks */
-	ot->exec = graphkeys_select_less_exec;
-	ot->poll = graphop_visible_keyframes_poll;
+  /* api callbacks */
+  ot->exec = graphkeys_select_less_exec;
+  ot->poll = graphop_visible_keyframes_poll;
 
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
 /* ******************** Select Left/Right Operator ************************* */
@@ -915,151 +920,152 @@ void GRAPH_OT_select_less(wmOperatorType *ot)
 
 /* defines for left-right select tool */
 static const EnumPropertyItem prop_graphkeys_leftright_select_types[] = {
-	{GRAPHKEYS_LRSEL_TEST, "CHECK", 0, "Check if Select Left or Right", ""},
-	{GRAPHKEYS_LRSEL_LEFT, "LEFT", 0, "Before current frame", ""},
-	{GRAPHKEYS_LRSEL_RIGHT, "RIGHT", 0, "After current frame", ""},
-	{0, NULL, 0, NULL, NULL},
+    {GRAPHKEYS_LRSEL_TEST, "CHECK", 0, "Check if Select Left or Right", ""},
+    {GRAPHKEYS_LRSEL_LEFT, "LEFT", 0, "Before current frame", ""},
+    {GRAPHKEYS_LRSEL_RIGHT, "RIGHT", 0, "After current frame", ""},
+    {0, NULL, 0, NULL, NULL},
 };
 
 /* --------------------------------- */
 
 static void graphkeys_select_leftright(bAnimContext *ac, short leftright, short select_mode)
 {
-	ListBase anim_data = {NULL, NULL};
-	bAnimListElem *ale;
-	int filter;
-
-	KeyframeEditFunc ok_cb, select_cb;
-	KeyframeEditData ked = {{NULL}};
-	Scene *scene = ac->scene;
-
-	/* if select mode is replace, deselect all keyframes (and channels) first */
-	if (select_mode == SELECT_REPLACE) {
-		select_mode = SELECT_ADD;
-
-		/* - deselect all other keyframes, so that just the newly selected remain
-		 * - channels aren't deselected, since we don't re-select any as a consequence
-		 */
-		deselect_graph_keys(ac, 0, SELECT_SUBTRACT, false);
-	}
-
-	/* set callbacks and editing data */
-	ok_cb = ANIM_editkeyframes_ok(BEZT_OK_FRAMERANGE);
-	select_cb = ANIM_editkeyframes_select(select_mode);
-
-	if (leftright == GRAPHKEYS_LRSEL_LEFT) {
-		ked.f1 = MINAFRAMEF;
-		ked.f2 = (float)(CFRA + 0.1f);
-	}
-	else {
-		ked.f1 = (float)(CFRA - 0.1f);
-		ked.f2 = MAXFRAMEF;
-	}
-
-	/* filter data */
-	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_NODUPLIS);
-	ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
-
-	/* select keys */
-	for (ale = anim_data.first; ale; ale = ale->next) {
-		AnimData *adt = ANIM_nla_mapping_get(ac, ale);
-
-		if (adt) {
-			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 1);
-			ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
-			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 1);
-		}
-		else
-			ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
-	}
-
-	/* Cleanup */
-	ANIM_animdata_freelist(&anim_data);
+  ListBase anim_data = {NULL, NULL};
+  bAnimListElem *ale;
+  int filter;
+
+  KeyframeEditFunc ok_cb, select_cb;
+  KeyframeEditData ked = {{NULL}};
+  Scene *scene = ac->scene;
+
+  /* if select mode is replace, deselect all keyframes (and channels) first */
+  if (select_mode == SELECT_REPLACE) {
+    select_mode = SELECT_ADD;
+
+    /* - deselect all other keyframes, so that just the newly selected remain
+     * - channels aren't deselected, since we don't re-select any as a consequence
+     */
+    deselect_graph_keys(ac, 0, SELECT_SUBTRACT, false);
+  }
+
+  /* set callbacks and editing data */
+  ok_cb = ANIM_editkeyframes_ok(BEZT_OK_FRAMERANGE);
+  select_cb = ANIM_editkeyframes_select(select_mode);
+
+  if (leftright == GRAPHKEYS_LRSEL_LEFT) {
+    ked.f1 = MINAFRAMEF;
+    ked.f2 = (float)(CFRA + 0.1f);
+  }
+  else {
+    ked.f1 = (float)(CFRA - 0.1f);
+    ked.f2 = MAXFRAMEF;
+  }
+
+  /* filter data */
+  filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_NODUPLIS);
+  ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
+
+  /* select keys */
+  for (ale = anim_data.first; ale; ale = ale->next) {
+    AnimData *adt = ANIM_nla_mapping_get(ac, ale);
+
+    if (adt) {
+      ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 1);
+      ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
+      ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 1);
+    }
+    else
+      ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
+  }
+
+  /* Cleanup */
+  ANIM_animdata_freelist(&anim_data);
 }
 
 /* ----------------- */
 
 static int graphkeys_select_leftright_exec(bContext *C, wmOperator *op)
 {
-	bAnimContext ac;
-	short leftright = RNA_enum_get(op->ptr, "mode");
-	short selectmode;
+  bAnimContext ac;
+  short leftright = RNA_enum_get(op->ptr, "mode");
+  short selectmode;
 
-	/* get editor data */
-	if (ANIM_animdata_get_context(C, &ac) == 0)
-		return OPERATOR_CANCELLED;
+  /* get editor data */
+  if (ANIM_animdata_get_context(C, &ac) == 0)
+    return OPERATOR_CANCELLED;
 
-	/* select mode is either replace (deselect all, then add) or add/extend */
-	if (RNA_boolean_get(op->ptr, "extend"))
-		selectmode = SELECT_INVERT;
-	else
-		selectmode = SELECT_REPLACE;
+  /* select mode is either replace (deselect all, then add) or add/extend */
+  if (RNA_boolean_get(op->ptr, "extend"))
+    selectmode = SELECT_INVERT;
+  else
+    selectmode = SELECT_REPLACE;
 
-	/* if "test" mode is set, we don't have any info to set this with */
-	if (leftright == GRAPHKEYS_LRSEL_TEST)
-		return OPERATOR_CANCELLED;
+  /* if "test" mode is set, we don't have any info to set this with */
+  if (leftright == GRAPHKEYS_LRSEL_TEST)
+    return OPERATOR_CANCELLED;
 
-	/* do the selecting now */
-	graphkeys_select_leftright(&ac, leftright, selectmode);
+  /* do the selecting now */
+  graphkeys_select_leftright(&ac, leftright, selectmode);
 
-	/* set notifier that keyframe selection (and channels too) have changed */
-	WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
-	WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL);
+  /* set notifier that keyframe selection (and channels too) have changed */
+  WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
+  WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL);
 
-	return OPERATOR_FINISHED;
+  return OPERATOR_FINISHED;
 }
 
 static int graphkeys_select_leftright_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	bAnimContext ac;
-	short leftright = RNA_enum_get(op->ptr, "mode");
-
-	/* get editor data */
-	if (ANIM_animdata_get_context(C, &ac) == 0)
-		return OPERATOR_CANCELLED;
-
-	/* handle mode-based testing */
-	if (leftright == GRAPHKEYS_LRSEL_TEST) {
-		Scene *scene = ac.scene;
-		ARegion *ar = ac.ar;
-		View2D *v2d = &ar->v2d;
-		float x;
-
-		/* determine which side of the current frame mouse is on */
-		x = UI_view2d_region_to_view_x(v2d, event->mval[0]);
-		if (x < CFRA)
-			RNA_enum_set(op->ptr, "mode", GRAPHKEYS_LRSEL_LEFT);
-		else
-			RNA_enum_set(op->ptr, "mode", GRAPHKEYS_LRSEL_RIGHT);
-	}
-
-	/* perform selection */
-	return graphkeys_select_leftright_exec(C, op);
+  bAnimContext ac;
+  short leftright = RNA_enum_get(op->ptr, "mode");
+
+  /* get editor data */
+  if (ANIM_animdata_get_context(C, &ac) == 0)
+    return OPERATOR_CANCELLED;
+
+  /* handle mode-based testing */
+  if (leftright == GRAPHKEYS_LRSEL_TEST) {
+    Scene *scene = ac.scene;
+    ARegion *ar = ac.ar;
+    View2D *v2d = &ar->v2d;
+    float x;
+
+    /* determine which side of the current frame mouse is on */
+    x = UI_view2d_region_to_view_x(v2d, event->mval[0]);
+    if (x < CFRA)
+      RNA_enum_set(op->ptr, "mode", GRAPHKEYS_LRSEL_LEFT);
+    else
+      RNA_enum_set(op->ptr, "mode", GRAPHKEYS_LRSEL_RIGHT);
+  }
+
+  /* perform selection */
+  return graphkeys_select_leftright_exec(C, op);
 }
 
 void GRAPH_OT_select_leftright(wmOperatorType *ot)
 {
-	PropertyRNA *prop;
+  PropertyRNA *prop;
 
-	/* identifiers */
-	ot->name = "Select Left/Right";
-	ot->idname = "GRAPH_OT_select_leftright";
-	ot->description = "Select keyframes to the left or the right of the current frame";
+  /* identifiers */
+  ot->name = "Select Left/Right";
+  ot->idname = "GRAPH_OT_select_leftright";
+  ot->description = "Select keyframes to the left or the right of the current frame";
 
-	/* api callbacks  */
-	ot->invoke = graphkeys_select_leftright_invoke;
-	ot->exec = graphkeys_select_leftright_exec;
-	ot->poll = graphop_visible_keyframes_poll;
+  /* api callbacks  */
+  ot->invoke = graphkeys_select_leftright_invoke;
+  ot->exec = graphkeys_select_leftright_exec;
+  ot->poll = graphop_visible_keyframes_poll;
 
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-	/* id-props */
-	ot->prop = RNA_def_enum(ot->srna, "mode", prop_graphkeys_leftright_select_types, GRAPHKEYS_LRSEL_TEST, "Mode", "");
-	RNA_def_property_flag(ot->prop, PROP_SKIP_SAVE);
+  /* id-props */
+  ot->prop = RNA_def_enum(
+      ot->srna, "mode", prop_graphkeys_leftright_select_types, GRAPHKEYS_LRSEL_TEST, "Mode", "");
+  RNA_def_property_flag(ot->prop, PROP_SKIP_SAVE);
 
-	prop = RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", "");
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+  prop = RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", "");
+  RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
 
 /* ******************** Mouse-Click Select Operator *********************** */
@@ -1074,32 +1080,32 @@ void GRAPH_OT_select_leftright(wmOperatorType *ot)
 
 /* temp info for caching handle vertices close */
 typedef struct tNearestVertInfo {
-	struct tNearestVertInfo *next, *prev;
+  struct tNearestVertInfo *next, *prev;
 
-	FCurve *fcu;        /* F-Curve that keyframe comes from */
+  FCurve *fcu; /* F-Curve that keyframe comes from */
 
-	BezTriple *bezt;    /* keyframe to consider */
-	FPoint *fpt;        /* sample point to consider */
+  BezTriple *bezt; /* keyframe to consider */
+  FPoint *fpt;     /* sample point to consider */
 
-	short hpoint;       /* the handle index that we hit (eHandleIndex) */
-	short sel;          /* whether the handle is selected or not */
-	int dist;           /* distance from mouse to vert */
+  short hpoint; /* the handle index that we hit (eHandleIndex) */
+  short sel;    /* whether the handle is selected or not */
+  int dist;     /* distance from mouse to vert */
 
-	eAnim_ChannelType ctype; /* type of animation channel this FCurve comes from */
+  eAnim_ChannelType ctype; /* type of animation channel this FCurve comes from */
 
-	float frame;        /* frame that point was on when it matched (global time) */
+  float frame; /* frame that point was on when it matched (global time) */
 } tNearestVertInfo;
 
 /* Tags for the type of graph vert that we have */
 typedef enum eGraphVertIndex {
-	NEAREST_HANDLE_LEFT = -1,
-	NEAREST_HANDLE_KEY,
-	NEAREST_HANDLE_RIGHT,
+  NEAREST_HANDLE_LEFT = -1,
+  NEAREST_HANDLE_KEY,
+  NEAREST_HANDLE_RIGHT,
 } eGraphVertIndex;
 
 /* Tolerance for absolute radius (in pixels) of the vert from the cursor to use */
 // TODO: perhaps this should depend a bit on the size that the user set the vertices to be?
-#define GVERTSEL_TOL    10
+#define GVERTSEL_TOL 10
 
 /* ....... */
 
@@ -1107,171 +1113,210 @@ typedef enum eGraphVertIndex {
 // XXX also need to check for int-values only?
 static bool fcurve_handle_sel_check(SpaceGraph *sipo, BezTriple *bezt)
 {
-	if (sipo->flag & SIPO_NOHANDLES) return 0;
-	if ((sipo->flag & SIPO_SELVHANDLESONLY) && BEZT_ISSEL_ANY(bezt) == 0) return 0;
-	return 1;
+  if (sipo->flag & SIPO_NOHANDLES)
+    return 0;
+  if ((sipo->flag & SIPO_SELVHANDLESONLY) && BEZT_ISSEL_ANY(bezt) == 0)
+    return 0;
+  return 1;
 }
 
 /* check if the given vertex is within bounds or not */
 // TODO: should we return if we hit something?
-static void nearest_fcurve_vert_store(
-        ListBase *matches, View2D *v2d, FCurve *fcu, eAnim_ChannelType ctype,
-        BezTriple *bezt, FPoint *fpt, short hpoint, const int mval[2], float unit_scale, float offset)
+static void nearest_fcurve_vert_store(ListBase *matches,
+                                      View2D *v2d,
+                                      FCurve *fcu,
+                                      eAnim_ChannelType ctype,
+                                      BezTriple *bezt,
+                                      FPoint *fpt,
+                                      short hpoint,
+                                      const int mval[2],
+                                      float unit_scale,
+                                      float offset)
 {
-	/* Keyframes or Samples? */
-	if (bezt) {
-		int screen_co[2], dist;
-
-		/* convert from data-space to screen coordinates
-		 * NOTE: hpoint+1 gives us 0,1,2 respectively for each handle,
-		 *  needed to access the relevant vertex coordinates in the 3x3
-		 *  'vec' matrix
-		 */
-		if (UI_view2d_view_to_region_clip(v2d,
-		                                  bezt->vec[hpoint + 1][0], (bezt->vec[hpoint + 1][1] + offset) * unit_scale,
-		                                  &screen_co[0], &screen_co[1]) &&
-		    /* check if distance from mouse cursor to vert in screen space is within tolerance */
-		    ((dist = len_v2v2_int(mval, screen_co)) <= GVERTSEL_TOL))
-		{
-			tNearestVertInfo *nvi = (tNearestVertInfo *)matches->last;
-			bool replace = false;
-
-			/* if there is already a point for the F-Curve, check if this point is closer than that was */
-			if ((nvi) && (nvi->fcu == fcu)) {
-				/* replace if we are closer, or if equal and that one wasn't selected but we are... */
-				if ((nvi->dist > dist) || ((nvi->sel == 0) && BEZT_ISSEL_ANY(bezt)))
-					replace = 1;
-			}
-			/* add new if not replacing... */
-			if (replace == 0)
-				nvi = MEM_callocN(sizeof(tNearestVertInfo), "Nearest Graph Vert Info - Bezt");
-
-			/* store values */
-			nvi->fcu = fcu;
-			nvi->ctype = ctype;
-
-			nvi->bezt = bezt;
-			nvi->hpoint = hpoint;
-			nvi->dist = dist;
-
-			nvi->frame = bezt->vec[1][0]; /* currently in global time... */
-
-			nvi->sel = BEZT_ISSEL_ANY(bezt); // XXX... should this use the individual verts instead?
-
-			/* add to list of matches if appropriate... */
-			if (replace == 0)
-				BLI_addtail(matches, nvi);
-		}
-	}
-	else if (fpt) {
-		/* TODO... */
-	}
+  /* Keyframes or Samples? */
+  if (bezt) {
+    int screen_co[2], dist;
+
+    /* convert from data-space to screen coordinates
+     * NOTE: hpoint+1 gives us 0,1,2 respectively for each handle,
+     *  needed to access the relevant vertex coordinates in the 3x3
+     *  'vec' matrix
+     */
+    if (UI_view2d_view_to_region_clip(v2d,
+                                      bezt->vec[hpoint + 1][0],
+                                      (bezt->vec[hpoint + 1][1] + offset) * unit_scale,
+                                      &screen_co[0],
+                                      &screen_co[1]) &&
+        /* check if distance from mouse cursor to vert in screen space is within tolerance */
+        ((dist = len_v2v2_int(mval, screen_co)) <= GVERTSEL_TOL)) {
+      tNearestVertInfo *nvi = (tNearestVertInfo *)matches->last;
+      bool replace = false;
+
+      /* if there is already a point for the F-Curve, check if this point is closer than that was */
+      if ((nvi) && (nvi->fcu == fcu)) {
+        /* replace if we are closer, or if equal and that one wasn't selected but we are... */
+        if ((nvi->dist > dist) || ((nvi->sel == 0) && BEZT_ISSEL_ANY(bezt)))
+          replace = 1;
+      }
+      /* add new if not replacing... */
+      if (replace == 0)
+        nvi = MEM_callocN(sizeof(tNearestVertInfo), "Nearest Graph Vert Info - Bezt");
+
+      /* store values */
+      nvi->fcu = fcu;
+      nvi->ctype = ctype;
+
+      nvi->bezt = bezt;
+      nvi->hpoint = hpoint;
+      nvi->dist = dist;
+
+      nvi->frame = bezt->vec[1][0]; /* currently in global time... */
+
+      nvi->sel = BEZT_ISSEL_ANY(bezt);  // XXX... should this use the individual verts instead?
+
+      /* add to list of matches if appropriate... */
+      if (replace == 0)
+        BLI_addtail(matches, nvi);
+    }
+  }
+  else if (fpt) {
+    /* TODO... */
+  }
 }
 
 /* helper for find_nearest_fcurve_vert() - build the list of nearest matches */
 static void get_nearest_fcurve_verts_list(bAnimContext *ac, const int mval[2], ListBase *matches)
 {
-	ListBase anim_data = {NULL, NULL};
-	bAnimListElem *ale;
-	int filter;
-
-	SpaceGraph *sipo = (SpaceGraph *)ac->sl;
-	View2D *v2d = &ac->ar->v2d;
-	short mapping_flag = 0;
-
-	/* get curves to search through
-	 * - if the option to only show keyframes that belong to selected F-Curves is enabled,
-	 *   include the 'only selected' flag...
-	 */
-	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
-	if (sipo->flag & SIPO_SELCUVERTSONLY)   // FIXME: this should really be check for by the filtering code...
-		filter |= ANIMFILTER_SEL;
-	mapping_flag |= ANIM_get_normalization_flags(ac);
-	ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
-
-	for (ale = anim_data.first; ale; ale = ale->next) {
-		FCurve *fcu = (FCurve *)ale->key_data;
-		AnimData *adt = ANIM_nla_mapping_get(ac, ale);
-		float offset;
-		float unit_scale = ANIM_unit_mapping_get_factor(ac->scene, ale->id, fcu, mapping_flag, &offset);
-
-		/* apply NLA mapping to all the keyframes */
-		if (adt)
-			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 0);
-
-		if (fcu->bezt) {
-			BezTriple *bezt1 = fcu->bezt, *prevbezt = NULL;
-			int i;
-
-			for (i = 0; i < fcu->totvert; i++, prevbezt = bezt1, bezt1++) {
-				/* keyframe */
-				nearest_fcurve_vert_store(matches, v2d, fcu, ale->type, bezt1, NULL, NEAREST_HANDLE_KEY, mval, unit_scale, offset);
-
-				/* handles - only do them if they're visible */
-				if (fcurve_handle_sel_check(sipo, bezt1) && (fcu->totvert > 1)) {
-					/* first handle only visible if previous segment had handles */
-					if ((!prevbezt && (bezt1->ipo == BEZT_IPO_BEZ)) || (prevbezt && (prevbezt->ipo == BEZT_IPO_BEZ))) {
-						nearest_fcurve_vert_store(matches, v2d, fcu, ale->type, bezt1, NULL, NEAREST_HANDLE_LEFT, mval, unit_scale, offset);
-					}
-
-					/* second handle only visible if this segment is bezier */
-					if (bezt1->ipo == BEZT_IPO_BEZ) {
-						nearest_fcurve_vert_store(matches, v2d, fcu, ale->type, bezt1, NULL, NEAREST_HANDLE_RIGHT, mval, unit_scale, offset);
-					}
-				}
-			}
-		}
-		else if (fcu->fpt) {
-			// TODO; do this for samples too
-
-		}
-
-		/* un-apply NLA mapping from all the keyframes */
-		if (adt)
-			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 0);
-	}
-
-	/* free channels */
-	ANIM_animdata_freelist(&anim_data);
+  ListBase anim_data = {NULL, NULL};
+  bAnimListElem *ale;
+  int filter;
+
+  SpaceGraph *sipo = (SpaceGraph *)ac->sl;
+  View2D *v2d = &ac->ar->v2d;
+  short mapping_flag = 0;
+
+  /* get curves to search through
+   * - if the option to only show keyframes that belong to selected F-Curves is enabled,
+   *   include the 'only selected' flag...
+   */
+  filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
+  if (sipo->flag &
+      SIPO_SELCUVERTSONLY)  // FIXME: this should really be check for by the filtering code...
+    filter |= ANIMFILTER_SEL;
+  mapping_flag |= ANIM_get_normalization_flags(ac);
+  ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
+
+  for (ale = anim_data.first; ale; ale = ale->next) {
+    FCurve *fcu = (FCurve *)ale->key_data;
+    AnimData *adt = ANIM_nla_mapping_get(ac, ale);
+    float offset;
+    float unit_scale = ANIM_unit_mapping_get_factor(
+        ac->scene, ale->id, fcu, mapping_flag, &offset);
+
+    /* apply NLA mapping to all the keyframes */
+    if (adt)
+      ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 0);
+
+    if (fcu->bezt) {
+      BezTriple *bezt1 = fcu->bezt, *prevbezt = NULL;
+      int i;
+
+      for (i = 0; i < fcu->totvert; i++, prevbezt = bezt1, bezt1++) {
+        /* keyframe */
+        nearest_fcurve_vert_store(matches,
+                                  v2d,
+                                  fcu,
+                                  ale->type,
+                                  bezt1,
+                                  NULL,
+                                  NEAREST_HANDLE_KEY,
+                                  mval,
+                                  unit_scale,
+                                  offset);
+
+        /* handles - only do them if they're visible */
+        if (fcurve_handle_sel_check(sipo, bezt1) && (fcu->totvert > 1)) {
+          /* first handle only visible if previous segment had handles */
+          if ((!prevbezt && (bezt1->ipo == BEZT_IPO_BEZ)) ||
+              (prevbezt && (prevbezt->ipo == BEZT_IPO_BEZ))) {
+            nearest_fcurve_vert_store(matches,
+                                      v2d,
+                                      fcu,
+                                      ale->type,
+                                      bezt1,
+                                      NULL,
+                                      NEAREST_HANDLE_LEFT,
+                                      mval,
+                                      unit_scale,
+                                      offset);
+          }
+
+          /* second handle only visible if this segment is bezier */
+          if (bezt1->ipo == BEZT_IPO_BEZ) {
+            nearest_fcurve_vert_store(matches,
+                                      v2d,
+                                      fcu,
+                                      ale->type,
+                                      bezt1,
+                                      NULL,
+                                      NEAREST_HANDLE_RIGHT,
+                                      mval,
+                                      unit_scale,
+                                      offset);
+          }
+        }
+      }
+    }
+    else if (fcu->fpt) {
+      // TODO; do this for samples too
+    }
+
+    /* un-apply NLA mapping from all the keyframes */
+    if (adt)
+      ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 0);
+  }
+
+  /* free channels */
+  ANIM_animdata_freelist(&anim_data);
 }
 
 /* helper for find_nearest_fcurve_vert() - get the best match to use */
 static tNearestVertInfo *get_best_nearest_fcurve_vert(ListBase *matches)
 {
-	tNearestVertInfo *nvi = NULL;
-	short found = 0;
-
-	/* abort if list is empty */
-	if (BLI_listbase_is_empty(matches))
-		return NULL;
-
-	/* if list only has 1 item, remove it from the list and return */
-	if (BLI_listbase_is_single(matches)) {
-		/* need to remove from the list, otherwise it gets freed and then we can't return it */
-		return BLI_pophead(matches);
-	}
-
-	/* try to find the first selected F-Curve vert, then take the one after it */
-	for (nvi = matches->first; nvi; nvi = nvi->next) {
-		/* which mode of search are we in: find first selected, or find vert? */
-		if (found) {
-			/* just take this vert now that we've found the selected one
-			 * - we'll need to remove this from the list so that it can be returned to the original caller
-			 */
-			BLI_remlink(matches, nvi);
-			return nvi;
-		}
-		else {
-			/* if vert is selected, we've got what we want... */
-			if (nvi->sel)
-				found = 1;
-		}
-	}
-
-	/* if we're still here, this means that we failed to find anything appropriate in the first pass,
-	 * so just take the first item now...
-	 */
-	return BLI_pophead(matches);
+  tNearestVertInfo *nvi = NULL;
+  short found = 0;
+
+  /* abort if list is empty */
+  if (BLI_listbase_is_empty(matches))
+    return NULL;
+
+  /* if list only has 1 item, remove it from the list and return */
+  if (BLI_listbase_is_single(matches)) {
+    /* need to remove from the list, otherwise it gets freed and then we can't return it */
+    return BLI_pophead(matches);
+  }
+
+  /* try to find the first selected F-Curve vert, then take the one after it */
+  for (nvi = matches->first; nvi; nvi = nvi->next) {
+    /* which mode of search are we in: find first selected, or find vert? */
+    if (found) {
+      /* just take this vert now that we've found the selected one
+       * - we'll need to remove this from the list so that it can be returned to the original caller
+       */
+      BLI_remlink(matches, nvi);
+      return nvi;
+    }
+    else {
+      /* if vert is selected, we've got what we want... */
+      if (nvi->sel)
+        found = 1;
+    }
+  }
+
+  /* if we're still here, this means that we failed to find anything appropriate in the first pass,
+   * so just take the first item now...
+   */
+  return BLI_pophead(matches);
 }
 
 /* Find the nearest vertices (either a handle or the keyframe) that are nearest to the mouse cursor (in area coordinates)
@@ -1279,142 +1324,145 @@ static tNearestVertInfo *get_best_nearest_fcurve_vert(ListBase *matches)
  */
 static tNearestVertInfo *find_nearest_fcurve_vert(bAnimContext *ac, const int mval[2])
 {
-	ListBase matches = {NULL, NULL};
-	tNearestVertInfo *nvi;
+  ListBase matches = {NULL, NULL};
+  tNearestVertInfo *nvi;
 
-	/* step 1: get the nearest verts */
-	get_nearest_fcurve_verts_list(ac, mval, &matches);
+  /* step 1: get the nearest verts */
+  get_nearest_fcurve_verts_list(ac, mval, &matches);
 
-	/* step 2: find the best vert */
-	nvi = get_best_nearest_fcurve_vert(&matches);
+  /* step 2: find the best vert */
+  nvi = get_best_nearest_fcurve_vert(&matches);
 
-	BLI_freelistN(&matches);
+  BLI_freelistN(&matches);
 
-	/* return the best vert found */
-	return nvi;
+  /* return the best vert found */
+  return nvi;
 }
 
 /* ------------------- */
 
 /* option 1) select keyframe directly under mouse */
-static void mouse_graph_keys(bAnimContext *ac, const int mval[2], short select_mode, short curves_only)
+static void mouse_graph_keys(bAnimContext *ac,
+                             const int mval[2],
+                             short select_mode,
+                             short curves_only)
 {
-	SpaceGraph *sipo = (SpaceGraph *)ac->sl;
-	tNearestVertInfo *nvi;
-	BezTriple *bezt = NULL;
-
-	/* find the beztriple that we're selecting, and the handle that was clicked on */
-	nvi = find_nearest_fcurve_vert(ac, mval);
-
-	/* check if anything to select */
-	if (nvi == NULL)
-		return;
-
-	/* deselect all other curves? */
-	if (select_mode == SELECT_REPLACE) {
-		/* reset selection mode */
-		select_mode = SELECT_ADD;
-
-		/* deselect all other keyframes (+ F-Curves too) */
-		deselect_graph_keys(ac, 0, SELECT_SUBTRACT, true);
-
-		/* deselect other channels too, but only only do this if
-		 * selection of channel when the visibility of keyframes
-		 * doesn't depend on this
-		 */
-		if ((sipo->flag & SIPO_SELCUVERTSONLY) == 0)
-			ANIM_deselect_anim_channels(ac, ac->data, ac->datatype, 0, ACHANNEL_SETFLAG_CLEAR);
-	}
-
-	/* if points can be selected on this F-Curve */
-	// TODO: what about those with no keyframes?
-	if ((curves_only == 0) && ((nvi->fcu->flag & FCURVE_PROTECTED) == 0)) {
-		/* only if there's keyframe */
-		if (nvi->bezt) {
-			bezt = nvi->bezt; /* used to check bezt seletion is set */
-			/* depends on selection mode */
-			if (select_mode == SELECT_INVERT) {
-				/* keyframe - invert select of all */
-				if (nvi->hpoint == NEAREST_HANDLE_KEY) {
-					if (BEZT_ISSEL_ANY(bezt)) {
-						BEZT_DESEL_ALL(bezt);
-					}
-					else {
-						BEZT_SEL_ALL(bezt);
-					}
-				}
-
-				/* handles - toggle selection of relevant handle */
-				else if (nvi->hpoint == NEAREST_HANDLE_LEFT) {
-					/* toggle selection */
-					bezt->f1 ^= SELECT;
-				}
-				else {
-					/* toggle selection */
-					bezt->f3 ^= SELECT;
-				}
-			}
-			else {
-				/* if the keyframe was clicked on, select all verts of given beztriple */
-				if (nvi->hpoint == NEAREST_HANDLE_KEY) {
-					BEZT_SEL_ALL(bezt);
-				}
-				/* otherwise, select the handle that applied */
-				else if (nvi->hpoint == NEAREST_HANDLE_LEFT)
-					bezt->f1 |= SELECT;
-				else
-					bezt->f3 |= SELECT;
-			}
-		}
-		else if (nvi->fpt) {
-			// TODO: need to handle sample points
-		}
-	}
-	else {
-		KeyframeEditFunc select_cb;
-		KeyframeEditData ked;
-
-		/* initialize keyframe editing data */
-		memset(&ked, 0, sizeof(KeyframeEditData));
-
-		/* set up BezTriple edit callbacks */
-		select_cb = ANIM_editkeyframes_select(select_mode);
-
-		/* select all keyframes */
-		ANIM_fcurve_keyframes_loop(&ked, nvi->fcu, NULL, select_cb, NULL);
-	}
-
-	/* only change selection of channel when the visibility of keyframes doesn't depend on this */
-	if ((sipo->flag & SIPO_SELCUVERTSONLY) == 0) {
-		/* select or deselect curve? */
-		if (bezt) {
-			/* take selection status from item that got hit, to prevent flip/flop on channel
-			 * selection status when shift-selecting (i.e. "SELECT_INVERT") points
-			 */
-			if (BEZT_ISSEL_ANY(bezt))
-				nvi->fcu->flag |= FCURVE_SELECTED;
-			else
-				nvi->fcu->flag &= ~FCURVE_SELECTED;
-		}
-		else {
-			/* didn't hit any channel, so just apply that selection mode to the curve's selection status */
-			if (select_mode == SELECT_INVERT)
-				nvi->fcu->flag ^= FCURVE_SELECTED;
-			else if (select_mode == SELECT_ADD)
-				nvi->fcu->flag |= FCURVE_SELECTED;
-		}
-	}
-
-	/* set active F-Curve (NOTE: sync the filter flags with findnearest_fcurve_vert) */
-	/* needs to be called with (sipo->flag & SIPO_SELCUVERTSONLY)
-	 * otherwise the active flag won't be set T26452. */
-	if (nvi->fcu->flag & FCURVE_SELECTED) {
-		int filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
-		ANIM_set_active_channel(ac, ac->data, ac->datatype, filter, nvi->fcu, nvi->ctype);
-	}
-
-	/* free temp sample data for filtering */
-	MEM_freeN(nvi);
+  SpaceGraph *sipo = (SpaceGraph *)ac->sl;
+  tNearestVertInfo *nvi;
+  BezTriple *bezt = NULL;
+
+  /* find the beztriple that we're selecting, and the handle that was clicked on */
+  nvi = find_nearest_fcurve_vert(ac, mval);
+
+  /* check if anything to select */
+  if (nvi == NULL)
+    return;
+
+  /* deselect all other curves? */
+  if (select_mode == SELECT_REPLACE) {
+    /* reset selection mode */
+    select_mode = SELECT_ADD;
+
+    /* deselect all other keyframes (+ F-Curves too) */
+    deselect_graph_keys(ac, 0, SELECT_SUBTRACT, true);
+
+    /* deselect other channels too, but only only do this if
+     * selection of channel when the visibility of keyframes
+     * doesn't depend on this
+     */
+    if ((sipo->flag & SIPO_SELCUVERTSONLY) == 0)
+      ANIM_deselect_anim_channels(ac, ac->data, ac->datatype, 0, ACHANNEL_SETFLAG_CLEAR);
+  }
+
+  /* if points can be selected on this F-Curve */
+  // TODO: what about those with no keyframes?
+  if ((curves_only == 0) && ((nvi->fcu->flag & FCURVE_PROTECTED) == 0)) {
+    /* only if there's keyframe */
+    if (nvi->bezt) {
+      bezt = nvi->bezt; /* used to check bezt seletion is set */
+      /* depends on selection mode */
+      if (select_mode == SELECT_INVERT) {
+        /* keyframe - invert select of all */
+        if (nvi->hpoint == NEAREST_HANDLE_KEY) {
+          if (BEZT_ISSEL_ANY(bezt)) {
+            BEZT_DESEL_ALL(bezt);
+          }
+          else {
+            BEZT_SEL_ALL(bezt);
+          }
+        }
+
+        /* handles - toggle selection of relevant handle */
+        else if (nvi->hpoint == NEAREST_HANDLE_LEFT) {
+          /* toggle selection */
+          bezt->f1 ^= SELECT;
+        }
+        else {
+          /* toggle selection */
+          bezt->f3 ^= SELECT;
+        }
+      }
+      else {
+        /* if the keyframe was clicked on, select all verts of given beztriple */
+        if (nvi->hpoint == NEAREST_HANDLE_KEY) {
+          BEZT_SEL_ALL(bezt);
+        }
+        /* otherwise, select the handle that applied */
+        else if (nvi->hpoint == NEAREST_HANDLE_LEFT)
+          bezt->f1 |= SELECT;
+        else
+          bezt->f3 |= SELECT;
+      }
+    }
+    else if (nvi->fpt) {
+      // TODO: need to handle sample points
+    }
+  }
+  else {
+    KeyframeEditFunc select_cb;
+    KeyframeEditData ked;
+
+    /* initialize keyframe editing data */
+    memset(&ked, 0, sizeof(KeyframeEditData));
+
+    /* set up BezTriple edit callbacks */
+    select_cb = ANIM_editkeyframes_select(select_mode);
+
+    /* select all keyframes */
+    ANIM_fcurve_keyframes_loop(&ked, nvi->fcu, NULL, select_cb, NULL);
+  }
+
+  /* only change selection of channel when the visibility of keyframes doesn't depend on this */
+  if ((sipo->flag & SIPO_SELCUVERTSONLY) == 0) {
+    /* select or deselect curve? */
+    if (bezt) {
+      /* take selection status from item that got hit, to prevent flip/flop on channel
+       * selection status when shift-selecting (i.e. "SELECT_INVERT") points
+       */
+      if (BEZT_ISSEL_ANY(bezt))
+        nvi->fcu->flag |= FCURVE_SELECTED;
+      else
+        nvi->fcu->flag &= ~FCURVE_SELECTED;
+    }
+    else {
+      /* didn't hit any channel, so just apply that selection mode to the curve's selection status */
+      if (select_mode == SELECT_INVERT)
+        nvi->fcu->flag ^= FCURVE_SELECTED;
+      else if (select_mode == SELECT_ADD)
+        nvi->fcu->flag |= FCURVE_SELECTED;
+    }
+  }
+
+  /* set active F-Curve (NOTE: sync the filter flags with findnearest_fcurve_vert) */
+  /* needs to be called with (sipo->flag & SIPO_SELCUVERTSONLY)
+   * otherwise the active flag won't be set T26452. */
+  if (nvi->fcu->flag & FCURVE_SELECTED) {
+    int filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
+    ANIM_set_active_channel(ac, ac->data, ac->datatype, filter, nvi->fcu, nvi->ctype);
+  }
+
+  /* free temp sample data for filtering */
+  MEM_freeN(nvi);
 }
 
 /* Option 2) Selects all the keyframes on either side of the current frame
@@ -1424,67 +1472,67 @@ static void mouse_graph_keys(bAnimContext *ac, const int mval[2], short select_m
 /* Option 3) Selects all visible keyframes in the same frame as the mouse click */
 static void graphkeys_mselect_column(bAnimContext *ac, const int mval[2], short select_mode)
 {
-	ListBase anim_data = {NULL, NULL};
-	bAnimListElem *ale;
-	int filter;
-
-	KeyframeEditFunc select_cb, ok_cb;
-	KeyframeEditData ked;
-	tNearestVertInfo *nvi;
-	float selx = (float)ac->scene->r.cfra;
-
-	/* find the beztriple that we're selecting, and the handle that was clicked on */
-	nvi = find_nearest_fcurve_vert(ac, mval);
-
-	/* check if anything to select */
-	if (nvi == NULL)
-		return;
-
-	/* get frame number on which elements should be selected */
-	// TODO: should we restrict to integer frames only?
-	selx = nvi->frame;
-
-	/* if select mode is replace, deselect all keyframes first */
-	if (select_mode == SELECT_REPLACE) {
-		/* reset selection mode to add to selection */
-		select_mode = SELECT_ADD;
-
-		/* - deselect all other keyframes, so that just the newly selected remain
-		 * - channels aren't deselected, since we don't re-select any as a consequence
-		 */
-		deselect_graph_keys(ac, 0, SELECT_SUBTRACT, false);
-	}
-
-	/* initialize keyframe editing data */
-	memset(&ked, 0, sizeof(KeyframeEditData));
-
-	/* set up BezTriple edit callbacks */
-	select_cb = ANIM_editkeyframes_select(select_mode);
-	ok_cb = ANIM_editkeyframes_ok(BEZT_OK_FRAME);
-
-	/* loop through all of the keys and select additional keyframes
-	 * based on the keys found to be selected above
-	 */
-	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
-	ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
-
-	for (ale = anim_data.first; ale; ale = ale->next) {
-		AnimData *adt = ANIM_nla_mapping_get(ac, ale);
-
-		/* set frame for validation callback to refer to */
-		if (adt)
-			ked.f1 = BKE_nla_tweakedit_remap(adt, selx, NLATIME_CONVERT_UNMAP);
-		else
-			ked.f1 = selx;
-
-		/* select elements with frame number matching cfra */
-		ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
-	}
-
-	/* free elements */
-	MEM_freeN(nvi);
-	BLI_freelistN(&ked.list);
-	ANIM_animdata_freelist(&anim_data);
+  ListBase anim_data = {NULL, NULL};
+  bAnimListElem *ale;
+  int filter;
+
+  KeyframeEditFunc select_cb, ok_cb;
+  KeyframeEditData ked;
+  tNearestVertInfo *nvi;
+  float selx = (float)ac->scene->r.cfra;
+
+  /* find the beztriple that we're selecting, and the handle that was clicked on */
+  nvi = find_nearest_fcurve_vert(ac, mval);
+
+  /* check if anything to select */
+  if (nvi == NULL)
+    return;
+
+  /* get frame number on which elements should be selected */
+  // TODO: should we restrict to integer frames only?
+  selx = nvi->frame;
+
+  /* if select mode is replace, deselect all keyframes first */
+  if (select_mode == SELECT_REPLACE) {
+    /* reset selection mode to add to selection */
+    select_mode = SELECT_ADD;
+
+    /* - deselect all other keyframes, so that just the newly selected remain
+     * - channels aren't deselected, since we don't re-select any as a consequence
+     */
+    deselect_graph_keys(ac, 0, SELECT_SUBTRACT, false);
+  }
+
+  /* initialize keyframe editing data */
+  memset(&ked, 0, sizeof(KeyframeEditData));
+
+  /* set up BezTriple edit callbacks */
+  select_cb = ANIM_editkeyframes_select(select_mode);
+  ok_cb = ANIM_editkeyframes_ok(BEZT_OK_FRAME);
+
+  /* loop through all of the keys and select additional keyframes
+   * based on the keys found to be selected above
+   */
+  filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
+  ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
+
+  for (ale = anim_data.first; ale; ale = ale->next) {
+    AnimData *adt = ANIM_nla_mapping_get(ac, ale);
+
+    /* set frame for validation callback to refer to */
+    if (adt)
+      ked.f1 = BKE_nla_tweakedit_remap(adt, selx, NLATIME_CONVERT_UNMAP);
+    else
+      ked.f1 = selx;
+
+    /* select elements with frame number matching cfra */
+    ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
+  }
+
+  /* free elements */
+  MEM_freeN(nvi);
+  BLI_freelistN(&ked.list);
+  ANIM_animdata_freelist(&anim_data);
 }
 
 /* ------------------- */
@@ -1492,69 +1540,80 @@ static void graphkeys_mselect_column(bAnimContext *ac, const int mval[2], short
 /* handle clicking */
 static int graphkeys_clickselect_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-	bAnimContext ac;
-	short selectmode;
-
-	/* get editor data */
-	if (ANIM_animdata_get_context(C, &ac) == 0)
-		return OPERATOR_CANCELLED;
-
-	/* select mode is either replace (deselect all, then add) or add/extend */
-	if (RNA_boolean_get(op->ptr, "extend"))
-		selectmode = SELECT_INVERT;
-	else
-		selectmode = SELECT_REPLACE;
-
-	/* figure out action to take */
-	if (RNA_boolean_get(op->ptr, "column")) {
-		/* select all keyframes in the same frame as the one that was under the mouse */
-		graphkeys_mselect_column(&ac, event->mval, selectmode);
-	}
-	else if (RNA_boolean_get(op->ptr, "curves")) {
-		/* select all keyframes in the same F-Curve as the one under the mouse */
-		mouse_graph_keys(&ac, event->mval, selectmode, 1);
-	}
-	else {
-		/* select keyframe under mouse */
-		mouse_graph_keys(&ac, event->mval, selectmode, 0);
-	}
-
-	/* set notifier that keyframe selection (and also channel selection in some cases) has changed */
-	WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
-	WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL);
-
-	/* for tweak grab to work */
-	return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH;
+  bAnimContext ac;
+  short selectmode;
+
+  /* get editor data */
+  if (ANIM_animdata_get_context(C, &ac) == 0)
+    return OPERATOR_CANCELLED;
+
+  /* select mode is either replace (deselect all, then add) or add/extend */
+  if (RNA_boolean_get(op->ptr, "extend"))
+    selectmode = SELECT_INVERT;
+  else
+    selectmode = SELECT_REPLACE;
+
+  /* figure out action to take */
+  if (RNA_boolean_get(op->ptr, "column")) {
+    /* select all keyframes in the same frame as the one that was under the mouse */
+    graphkeys_mselect_column(&ac, event->mval, selectmode);
+  }
+  else if (RNA_boolean_get(op->ptr, "curves")) {
+    /* select all keyframes in the same F-Curve as the one under the mouse */
+    mouse_graph_keys(&ac, event->mval, selectmode, 1);
+  }
+  else {
+    /* select keyframe under mouse */
+    mouse_graph_keys(&ac, event->mval, selectmode, 0);
+  }
+
+  /* set notifier that keyframe selection (and also channel selection in some cases) has changed */
+  WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
+  WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL);
+
+  /* for tweak grab to work */
+  return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH;
 }
 
 void GRAPH_OT_clickselect(wmOperatorType *ot)
 {
-	PropertyRNA *prop;
-
-	/* identifiers */
-	ot->name = "Select Keyframes";
-	ot->idname = "GRAPH_OT_clickselect";
-	ot->description = "Select keyframes by clicking on them";
-
-	/* callbacks */
-	ot->invoke = graphkeys_clickselect_invoke;
-	ot->poll = graphop_visible_keyframes_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_UNDO;
-
-	/* properties */
-	prop = RNA_def_boolean(ot->srna, "extend", 0, "Extend Select",
-	                       "Toggle keyframe selection instead of leaving newly selected keyframes only"); // SHIFTKEY
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
-
-	prop = RNA_def_boolean(ot->srna, "column", 0, "Column Select",
-	                       "Select all keyframes that occur on the same frame as the one under the mouse"); // ALTKEY
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
-
-	prop = RNA_def_boolean(ot->srna, "curves", 0, "Only Curves",
-	                       "Select all the keyframes in the curve"); // CTRLKEY + ALTKEY
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+  PropertyRNA *prop;
+
+  /* identifiers */
+  ot->name = "Select Keyframes";
+  ot->idname = "GRAPH_OT_clickselect";
+  ot->description = "Select keyframes by clicking on them";
+
+  /* callbacks */
+  ot->invoke = graphkeys_clickselect_invoke;
+  ot->poll = graphop_visible_keyframes_poll;
+
+  /* flags */
+  ot->flag = OPTYPE_UNDO;
+
+  /* properties */
+  prop = RNA_def_boolean(
+      ot->srna,
+      "extend",
+      0,
+      "Extend Select",
+      "Toggle keyframe selection instead of leaving newly selected keyframes only");  // SHIFTKEY
+  RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+
+  prop = RNA_def_boolean(
+      ot->srna,
+      "column",
+      0,
+      "Column Select",
+      "Select all keyframes that occur on the same frame as the one under the mouse");  // ALTKEY
+  RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+
+  prop = RNA_def_boolean(ot->srna,
+                         "curves",
+                         0,
+                         "Only Curves",
+                         "Select all the keyframes in the curve");  // CTRLKEY + ALTKEY
+  RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
 
 /* ************************************************************************** */