Merge branch 'master' into blender2.8

1 files changed, 114 insertions, 114 deletions

diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c
index 94984dd590c..7c6af0b4c62 100644
--- a/source/blender/editors/space_graph/graph_draw.c
+++ b/source/blender/editors/space_graph/graph_draw.c
@@ -63,7 +63,7 @@
 /* *************************** */
 /* Utility Drawing Defines */
 
-/* determine the alpha value that should be used when 
+/* determine the alpha value that should be used when
  * drawing components for some F-Curve (fcu)
  *	- selected F-Curves should be more visible than partially visible ones
  */
@@ -175,14 +175,14 @@ static void draw_fcurve_selected_keyframe_vertices(FCurve *fcu, View2D *v2d, boo
 
 	BezTriple *bezt = fcu->bezt;
 	for (int i = 0; i < fcu->totvert; i++, bezt++) {
-		/* as an optimization step, only draw those in view 
+		/* as an optimization step, only draw those in view
 		 *	- we apply a correction factor to ensure that points don't pop in/out due to slight twitches of view size
 		 */
 		if (IN_RANGE(bezt->vec[1][0], (v2d->cur.xmin - fac), (v2d->cur.xmax + fac))) {
 			if (edit) {
 				/* 'Keyframe' vertex only, as handle lines and handles have already been drawn
 				 *	- only draw those with correct selection state for the current drawing color
-				 *	- 
+				 *	-
 				 */
 				if ((bezt->f2 & SELECT) == sel)
 					immVertex2fv(pos, bezt->vec[1]);
@@ -273,7 +273,7 @@ static void draw_fcurve_vertices(ARegion *ar, FCurve *fcu, bool do_handles, bool
 {
 	View2D *v2d = &ar->v2d;
 
-	/* only draw points if curve is visible 
+	/* only draw points if curve is visible
 	 *  - draw unselected points before selected points as separate passes
 	 *     to make sure in the case of overlapping points that the selected is always visible
 	 *	- draw handles before keyframes, so that keyframes will overlap handles (keyframes are more important for users)
@@ -330,7 +330,7 @@ static void draw_fcurve_handles(SpaceIpo *sipo, FCurve *fcu)
 
 	immBeginAtMost(GWN_PRIM_LINES, 4 * 2 * fcu->totvert);
 
-	/* slightly hacky, but we want to draw unselected points before selected ones 
+	/* slightly hacky, but we want to draw unselected points before selected ones
 	 * so that selected points are clearly visible
 	 */
 	for (sel = 0; sel < 2; sel++) {
@@ -340,18 +340,18 @@ static void draw_fcurve_handles(SpaceIpo *sipo, FCurve *fcu)
 		unsigned char col[4];
 
 		for (b = 0; b < fcu->totvert; b++, prevbezt = bezt, bezt++) {
-			/* if only selected keyframes can get their handles shown, 
+			/* if only selected keyframes can get their handles shown,
 			 * check that keyframe is selected
 			 */
 			if (sipo->flag & SIPO_SELVHANDLESONLY) {
 				if (BEZT_ISSEL_ANY(bezt) == 0)
 					continue;
 			}
-			
+
 			/* draw handle with appropriate set of colors if selection is ok */
 			if ((bezt->f2 & SELECT) == sel) {
 				fp = bezt->vec[0];
-				
+
 				/* only draw first handle if previous segment had handles */
 				if ((!prevbezt && (bezt->ipo == BEZT_IPO_BEZ)) || (prevbezt && (prevbezt->ipo == BEZT_IPO_BEZ))) {
 					UI_GetThemeColor3ubv(basecol + bezt->h1, col);
@@ -361,7 +361,7 @@ static void draw_fcurve_handles(SpaceIpo *sipo, FCurve *fcu)
 					immAttrib4ubv(color, col);
 					immVertex2fv(pos, fp + 3);
 				}
-				
+
 				/* only draw second handle if this segment is bezier */
 				if (bezt->ipo == BEZT_IPO_BEZ) {
 					UI_GetThemeColor3ubv(basecol + bezt->h2, col);
@@ -385,7 +385,7 @@ static void draw_fcurve_handles(SpaceIpo *sipo, FCurve *fcu)
 					immAttrib4ubv(color, col);
 					immVertex2fv(pos, fp + 3);
 				}
-				
+
 				/* only draw second handle if this segment is bezier, and selection is ok */
 				if (((bezt->f3 & SELECT) == sel) &&
 				    (bezt->ipo == BEZT_IPO_BEZ))
@@ -408,7 +408,7 @@ static void draw_fcurve_handles(SpaceIpo *sipo, FCurve *fcu)
 
 /* Samples ---------------- */
 
-/* helper func - draw sample-range marker for an F-Curve as a cross 
+/* helper func - draw sample-range marker for an F-Curve as a cross
  * NOTE: the caller MUST HAVE GL_LINE_SMOOTH & GL_BLEND ENABLED, otherwise, the controls don't
  * have a consistent appearance (due to off-pixel alignments)...
  */
@@ -437,15 +437,15 @@ static void draw_fcurve_samples(SpaceIpo *sipo, ARegion *ar, FCurve *fcu)
 {
 	FPoint *first, *last;
 	float hsize, xscale, yscale;
-	
+
 	/* get view settings */
 	hsize = UI_GetThemeValuef(TH_VERTEX_SIZE);
 	UI_view2d_scale_get(&ar->v2d, &xscale, &yscale);
-	
+
 	/* get verts */
 	first = fcu->fpt;
 	last = (first) ? (first + (fcu->totvert - 1)) : (NULL);
-	
+
 	/* draw */
 	if (first && last) {
 		/* anti-aliased lines for more consistent appearance */
@@ -491,10 +491,10 @@ static void draw_fcurve_curve(bAnimContext *ac, ID *id, FCurve *fcu, View2D *v2d
 	/* disable any drivers temporarily */
 	driver = fcu->driver;
 	fcu->driver = NULL;
-	
+
 	/* compute unit correction factor */
 	unitFac = ANIM_unit_mapping_get_factor(ac->scene, id, fcu, mapping_flag, &offset);
-	
+
 	/* Note about sampling frequency:
 	 *  Ideally, this is chosen such that we have 1-2 pixels = 1 segment
 	 *	which means that our curves can be as smooth as possible. However,
@@ -510,10 +510,10 @@ static void draw_fcurve_curve(bAnimContext *ac, ID *id, FCurve *fcu, View2D *v2d
 	/* grid->dx represents the number of 'frames' between gridlines, but we divide by U.v2d_min_gridsize to get pixels-steps */
 	/* TODO: perhaps we should have 1.0 frames as upper limit so that curves don't get too distorted? */
 	samplefreq = dx / (U.v2d_min_gridsize * U.pixelsize);
-	
+
 	if (sipo->flag & SIPO_BEAUTYDRAW_OFF) {
 		/* Low Precision = coarse lower-bound clamping
-		 * 
+		 *
 		 * Although the "Beauty Draw" flag was originally for AA'd
 		 * line drawing, the sampling rate here has a much greater
 		 * impact on performance (e.g. for T40372)!
@@ -529,15 +529,15 @@ static void draw_fcurve_curve(bAnimContext *ac, ID *id, FCurve *fcu, View2D *v2d
 		if (samplefreq < 0.00001f)
 			samplefreq = 0.00001f;
 	}
-	
-	
+
+
 	/* the start/end times are simply the horizontal extents of the 'cur' rect */
 	stime = v2d->cur.xmin;
 	etime = v2d->cur.xmax + samplefreq; /* + samplefreq here so that last item gets included... */
-	
-	
-	/* at each sampling interval, add a new vertex 
-	 *	- apply the unit correction factor to the calculated values so that 
+
+
+	/* at each sampling interval, add a new vertex
+	 *	- apply the unit correction factor to the calculated values so that
 	 *	  the displayed values appear correctly in the viewport
 	 */
 
@@ -584,11 +584,11 @@ static void draw_fcurve_curve_samples(bAnimContext *ac, ID *id, FCurve *fcu, Vie
 	gpuTranslate2f(0.0f, offset);
 
 	immBegin(GWN_PRIM_LINE_STRIP, count);
-	
+
 	/* extrapolate to left? - left-side of view comes before first keyframe? */
 	if (prevfpt->vec[0] > v2d->cur.xmin) {
 		v[0] = v2d->cur.xmin;
-		
+
 		/* y-value depends on the interpolation */
 		if ((fcu->extend == FCURVE_EXTRAPOLATE_CONSTANT) || (fcu->flag & FCURVE_INT_VALUES) || (fcu->totvert == 1)) {
 			/* just extend across the first keyframe's value */
@@ -600,26 +600,26 @@ static void draw_fcurve_curve_samples(bAnimContext *ac, ID *id, FCurve *fcu, Vie
 			if (fac) fac = 1.0f / fac;
 			v[1] = prevfpt->vec[1] - fac * (prevfpt->vec[1] - fpt->vec[1]);
 		}
-		
+
 		immVertex2fv(shdr_pos, v);
 	}
-	
+
 	/* loop over samples, drawing segments */
 	/* draw curve between first and last keyframe (if there are enough to do so) */
 	while (b--) {
 		/* Linear interpolation: just add one point (which should add a new line segment) */
 		immVertex2fv(shdr_pos, prevfpt->vec);
-		
+
 		/* get next pointers */
 		if (b > 0) {
 			prevfpt++;
 		}
 	}
-	
+
 	/* extrapolate to right? (see code for left-extrapolation above too) */
 	if (prevfpt->vec[0] < v2d->cur.xmax) {
 		v[0] = v2d->cur.xmax;
-		
+
 		/* y-value depends on the interpolation */
 		if ((fcu->extend == FCURVE_EXTRAPOLATE_CONSTANT) || (fcu->flag & FCURVE_INT_VALUES) || (fcu->totvert == 1)) {
 			/* based on last keyframe's value */
@@ -632,29 +632,29 @@ static void draw_fcurve_curve_samples(bAnimContext *ac, ID *id, FCurve *fcu, Vie
 			if (fac) fac = 1.0f / fac;
 			v[1] = prevfpt->vec[1] - fac * (prevfpt->vec[1] - fpt->vec[1]);
 		}
-		
+
 		immVertex2fv(shdr_pos, v);
 	}
-	
+
 	immEnd();
 
 	gpuPopMatrix();
 }
 
-/* helper func - check if the F-Curve only contains easily drawable segments 
+/* helper func - check if the F-Curve only contains easily drawable segments
  * (i.e. no easing equation interpolations)
  */
 static bool fcurve_can_use_simple_bezt_drawing(FCurve *fcu)
 {
 	BezTriple *bezt;
 	int i;
-	
+
 	for (i = 0, bezt = fcu->bezt; i < fcu->totvert; i++, bezt++) {
 		if (ELEM(bezt->ipo, BEZT_IPO_CONST, BEZT_IPO_LIN, BEZT_IPO_BEZ) == false) {
 			return false;
 		}
 	}
-	
+
 	return true;
 }
 
@@ -670,7 +670,7 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 	int resol;
 	float unit_scale, offset;
 	short mapping_flag = ANIM_get_normalization_flags(ac);
-	
+
 	/* apply unit mapping */
 	gpuPushMatrix();
 	unit_scale = ANIM_unit_mapping_get_factor(ac->scene, id, fcu, mapping_flag, &offset);
@@ -681,12 +681,12 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 	 * bezier interpolation, and are drawn at full res.
 	 * This is tricky to optimize, but maybe can be improved at some point... */
 	immBeginAtMost(GWN_PRIM_LINE_STRIP, (b * 32 + 3));
-	
+
 	/* extrapolate to left? */
 	if (prevbezt->vec[1][0] > v2d->cur.xmin) {
 		/* left-side of view comes before first keyframe, so need to extend as not cyclic */
 		v1[0] = v2d->cur.xmin;
-		
+
 		/* y-value depends on the interpolation */
 		if ((fcu->extend == FCURVE_EXTRAPOLATE_CONSTANT) || (prevbezt->ipo == BEZT_IPO_CONST) || (fcu->totvert == 1)) {
 			/* just extend across the first keyframe's value */
@@ -704,17 +704,17 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 			if (fac) fac = 1.0f / fac;
 			v1[1] = prevbezt->vec[1][1] - fac * (prevbezt->vec[0][1] - prevbezt->vec[1][1]);
 		}
-		
+
 		immVertex2fv(pos, v1);
 	}
-	
+
 	/* if only one keyframe, add it now */
 	if (fcu->totvert == 1) {
 		v1[0] = prevbezt->vec[1][0];
 		v1[1] = prevbezt->vec[1][1];
 		immVertex2fv(pos, v1);
 	}
-	
+
 	/* draw curve between first and last keyframe (if there are enough to do so) */
 	/* TODO: optimize this to not have to calc stuff out of view too? */
 	while (b--) {
@@ -723,7 +723,7 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 			v1[0] = prevbezt->vec[1][0];
 			v1[1] = prevbezt->vec[1][1];
 			immVertex2fv(pos, v1);
-			
+
 			v1[0] = bezt->vec[1][0];
 			v1[1] = prevbezt->vec[1][1];
 			immVertex2fv(pos, v1);
@@ -735,10 +735,10 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 			immVertex2fv(pos, v1);
 		}
 		else if (prevbezt->ipo == BEZT_IPO_BEZ) {
-			/* Bezier-Interpolation: draw curve as series of segments between keyframes 
+			/* Bezier-Interpolation: draw curve as series of segments between keyframes
 			 *	- resol determines number of points to sample in between keyframes
 			 */
-			
+
 			/* resol depends on distance between points (not just horizontal) OR is a fixed high res */
 			/* TODO: view scale should factor into this someday too... */
 			if (fcu->driver) {
@@ -747,7 +747,7 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 			else {
 				resol = (int)(5.0f * len_v2v2(bezt->vec[1], prevbezt->vec[1]));
 			}
-			
+
 			if (resol < 2) {
 				/* only draw one */
 				v1[0] = prevbezt->vec[1][0];
@@ -758,32 +758,32 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 				/* clamp resolution to max of 32 */
 				/* NOTE: higher values will crash */
 				if (resol > 32) resol = 32;
-				
+
 				v1[0] = prevbezt->vec[1][0];
 				v1[1] = prevbezt->vec[1][1];
 				v2[0] = prevbezt->vec[2][0];
 				v2[1] = prevbezt->vec[2][1];
-				
+
 				v3[0] = bezt->vec[0][0];
 				v3[1] = bezt->vec[0][1];
 				v4[0] = bezt->vec[1][0];
 				v4[1] = bezt->vec[1][1];
-				
+
 				correct_bezpart(v1, v2, v3, v4);
-				
+
 				BKE_curve_forward_diff_bezier(v1[0], v2[0], v3[0], v4[0], data, resol, sizeof(float) * 3);
 				BKE_curve_forward_diff_bezier(v1[1], v2[1], v3[1], v4[1], data + 1, resol, sizeof(float) * 3);
-				
+
 				for (fp = data; resol; resol--, fp += 3) {
 					immVertex2fv(pos, fp);
 				}
 			}
 		}
-		
+
 		/* get next pointers */
 		prevbezt = bezt;
 		bezt++;
-		
+
 		/* last point? */
 		if (b == 0) {
 			v1[0] = prevbezt->vec[1][0];
@@ -791,11 +791,11 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 			immVertex2fv(pos, v1);
 		}
 	}
-	
+
 	/* extrapolate to right? (see code for left-extrapolation above too) */
 	if (prevbezt->vec[1][0] < v2d->cur.xmax) {
 		v1[0] = v2d->cur.xmax;
-		
+
 		/* y-value depends on the interpolation */
 		if ((fcu->extend == FCURVE_EXTRAPOLATE_CONSTANT) || (fcu->flag & FCURVE_INT_VALUES) || (prevbezt->ipo == BEZT_IPO_CONST) || (fcu->totvert == 1)) {
 			/* based on last keyframe's value */
@@ -814,10 +814,10 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 			if (fac) fac = 1.0f / fac;
 			v1[1] = prevbezt->vec[1][1] - fac * (prevbezt->vec[2][1] - prevbezt->vec[1][1]);
 		}
-		
+
 		immVertex2fv(pos, v1);
 	}
-	
+
 	immEnd();
 
 	gpuPopMatrix();
@@ -825,7 +825,7 @@ static void draw_fcurve_curve_bezts(bAnimContext *ac, ID *id, FCurve *fcu, View2
 
 /* Debugging -------------------------------- */
 
-/* Draw indicators which show the value calculated from the driver, 
+/* Draw indicators which show the value calculated from the driver,
  * and how this is mapped to the value that comes out of it. This
  * is handy for helping users better understand how to interpret
  * the graphs, and also facilitates debugging.
@@ -837,7 +837,7 @@ static void graph_draw_driver_debug(bAnimContext *ac, ID *id, FCurve *fcu)
 	short mapping_flag = ANIM_get_normalization_flags(ac);
 	float offset;
 	float unitfac = ANIM_unit_mapping_get_factor(ac->scene, id, fcu, mapping_flag, &offset);
-	
+
 	/* for now, only show when debugging driver... */
 	//if ((driver->flag & DRIVER_FLAG_SHOWDEBUG) == 0)
 	//	return;
@@ -852,19 +852,19 @@ static void graph_draw_driver_debug(bAnimContext *ac, ID *id, FCurve *fcu)
 	immUniform1i("num_colors", 0);  /* Simple dashes. */
 
 	/* No curve to modify/visualize the result?
-	 * => We still want to show the 1-1 default... 
+	 * => We still want to show the 1-1 default...
 	 */
 	if ((fcu->totvert == 0) && BLI_listbase_is_empty(&fcu->modifiers)) {
 		float t;
-		
+
 		/* draw with thin dotted lines in style of what curve would have been */
 		immUniformColor3fv(fcu->color);
-		
+
 		immUniform1f("dash_width", 40.0f);
 		immUniform1f("dash_factor", 0.5f);
 		glLineWidth(2.0f);
-		
-		/* draw 1-1 line, stretching just past the screen limits 
+
+		/* draw 1-1 line, stretching just past the screen limits
 		 * NOTE: we need to scale the y-values to be valid for the units
 		 */
 		immBegin(GWN_PRIM_LINES, 2);
@@ -877,17 +877,17 @@ static void graph_draw_driver_debug(bAnimContext *ac, ID *id, FCurve *fcu)
 
 		immEnd();
 	}
-	
+
 	/* draw driver only if actually functional */
 	if ((driver->flag & DRIVER_FLAG_INVALID) == 0) {
 		/* grab "coordinates" for driver outputs */
 		float x = driver->curval;
 		float y = fcu->curval * unitfac;
-		
+
 		/* only draw indicators if the point is in range*/
 		if (x >= v2d->cur.xmin) {
 			float co[2];
-			
+
 			/* draw dotted lines leading towards this point from both axes ....... */
 			immUniformColor3f(0.9f, 0.9f, 0.9f);
 			immUniform1f("dash_width", 10.0f);
@@ -916,7 +916,7 @@ static void graph_draw_driver_debug(bAnimContext *ac, ID *id, FCurve *fcu)
 			immVertex2fv(shdr_pos, co);
 
 			immEnd();
-			
+
 			immUnbindProgram();
 
 			/* GWN_PRIM_POINTS do not survive dashed line geometry shader... */
@@ -926,15 +926,15 @@ static void graph_draw_driver_debug(bAnimContext *ac, ID *id, FCurve *fcu)
 			/* -> outer frame */
 			immUniformColor3f(0.9f, 0.9f, 0.9f);
 			glPointSize(7.0);
-			
+
 			immBegin(GWN_PRIM_POINTS, 1);
 			immVertex2f(shdr_pos, x, y);
 			immEnd();
-			
+
 			/* inner frame */
 			immUniformColor3f(0.9f, 0.0f, 0.0f);
 			glPointSize(3.0);
-			
+
 			immBegin(GWN_PRIM_POINTS, 1);
 			immVertex2f(shdr_pos, x, y);
 			immEnd();
@@ -946,16 +946,16 @@ static void graph_draw_driver_debug(bAnimContext *ac, ID *id, FCurve *fcu)
 
 /* Public Curve-Drawing API  ---------------- */
 
-/* Draw the 'ghost' F-Curves (i.e. snapshots of the curve) 
+/* Draw the 'ghost' F-Curves (i.e. snapshots of the curve)
  * NOTE: unit mapping has already been applied to the values, so do not try and apply again
  */
 void graph_draw_ghost_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
 {
 	FCurve *fcu;
-	
+
 	/* draw with thick dotted lines */
 	glLineWidth(3.0f);
-	
+
 	/* anti-aliased lines for less jagged appearance */
 	if ((sipo->flag & SIPO_BEAUTYDRAW_OFF) == 0) {
 		glEnable(GL_LINE_SMOOTH);
@@ -976,12 +976,12 @@ void graph_draw_ghost_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
 
 	/* the ghost curves are simply sampled F-Curves stored in sipo->ghostCurves */
 	for (fcu = sipo->ghostCurves.first; fcu; fcu = fcu->next) {
-		/* set whatever color the curve has set 
+		/* set whatever color the curve has set
 		 *  - this is set by the function which creates these
 		 *	- draw with a fixed opacity of 2
 		 */
 		immUniformColor3fvAlpha(fcu->color, 0.5f);
-		
+
 		/* simply draw the stored samples */
 		draw_fcurve_curve_samples(ac, NULL, fcu, &ar->v2d, shdr_pos);
 	}
@@ -1002,21 +1002,21 @@ void graph_draw_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGrid
 	ListBase anim_data = {NULL, NULL};
 	bAnimListElem *ale;
 	int filter;
-	
+
 	/* build list of curves to draw */
 	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE);
 	filter |= ((sel) ? (ANIMFILTER_SEL) : (ANIMFILTER_UNSEL));
 	ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
-		
+
 	/* for each curve:
-	 *	draw curve, then handle-lines, and finally vertices in this order so that 
+	 *	draw curve, then handle-lines, and finally vertices in this order so that
 	 *  the data will be layered correctly
 	 */
 	for (ale = anim_data.first; ale; ale = ale->next) {
 		FCurve *fcu = (FCurve *)ale->key_data;
 		FModifier *fcm = find_active_fmodifier(&fcu->modifiers);
 		AnimData *adt = ANIM_nla_mapping_get(ac, ale);
-		
+
 		/* map keyframes for drawing if scaled F-Curve */
 		if (adt) {
 			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 0);
@@ -1028,7 +1028,7 @@ void graph_draw_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGrid
 		 *	- controls from active modifier take precedence over keyframes
 		 *	  (XXX! editing tools need to take this into account!)
 		 */
-		 
+
 		/* 1) draw curve line */
 		if (((fcu->modifiers.first) || (fcu->flag & FCURVE_INT_VALUES)) ||
 		    (((fcu->bezt) || (fcu->fpt)) && (fcu->totvert)))
@@ -1041,7 +1041,7 @@ void graph_draw_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGrid
 			else {
 				glLineWidth(1.0);
 			}
-			
+
 			/* anti-aliased lines for less jagged appearance */
 			if ((sipo->flag & SIPO_BEAUTYDRAW_OFF) == 0) {
 				glEnable(GL_LINE_SMOOTH);
@@ -1081,8 +1081,8 @@ void graph_draw_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGrid
 
 			/* draw F-Curve */
 			if ((fcu->modifiers.first) || (fcu->flag & FCURVE_INT_VALUES)) {
-				/* draw a curve affected by modifiers or only allowed to have integer values 
-				 * by sampling it at various small-intervals over the visible region 
+				/* draw a curve affected by modifiers or only allowed to have integer values
+				 * by sampling it at various small-intervals over the visible region
 				 */
 				draw_fcurve_curve(ac, ale->id, fcu, &ar->v2d, grid, shdr_pos);
 			}
@@ -1108,8 +1108,8 @@ void graph_draw_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGrid
 			}
 			glDisable(GL_BLEND);
 		}
-		
-		/* 2) draw handles and vertices as appropriate based on active 
+
+		/* 2) draw handles and vertices as appropriate based on active
 		 *	- if the option to only show controls if the F-Curve is selected is enabled, we must obey this
 		 */
 		if (!(sipo->flag & SIPO_SELCUVERTSONLY) || (fcu->flag & FCURVE_SELECTED)) {
@@ -1127,46 +1127,46 @@ void graph_draw_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGrid
 				short mapping_flag = ANIM_get_normalization_flags(ac);
 				float offset;
 				float unit_scale = ANIM_unit_mapping_get_factor(ac->scene, ale->id, fcu, mapping_flag, &offset);
-				
+
 				/* apply unit-scaling to all values via OpenGL */
 				gpuPushMatrix();
 				gpuScale2f(1.0f, unit_scale);
 				gpuTranslate2f(0.0f, offset);
-				
+
 				/* set this once and for all - all handles and handle-verts should use the same thickness */
 				glLineWidth(1.0);
-				
+
 				if (fcu->bezt) {
 					bool do_handles = draw_fcurve_handles_check(sipo, fcu);
-					
+
 					if (do_handles) {
 						/* only draw handles/vertices on keyframes */
 						glEnable(GL_BLEND);
 						draw_fcurve_handles(sipo, fcu);
 						glDisable(GL_BLEND);
 					}
-					
+
 					draw_fcurve_vertices(ar, fcu, do_handles, (sipo->flag & SIPO_SELVHANDLESONLY));
 				}
 				else {
 					/* samples: only draw two indicators at either end as indicators */
 					draw_fcurve_samples(sipo, ar, fcu);
 				}
-				
+
 				gpuPopMatrix();
 			}
 		}
-		
+
 		/* 3) draw driver debugging stuff */
 		if ((ac->datatype == ANIMCONT_DRIVERS) && (fcu->flag & FCURVE_ACTIVE)) {
 			graph_draw_driver_debug(ac, ale->id, fcu);
 		}
-		
+
 		/* undo mapping of keyframes for drawing if scaled F-Curve */
 		if (adt)
-			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 0); 
+			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 0);
 	}
-	
+
 	/* free list of curves */
 	ANIM_animdata_freelist(&anim_data);
 }
@@ -1175,40 +1175,40 @@ void graph_draw_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGrid
 /* Channel List */
 
 /* left hand part */
-void graph_draw_channel_names(bContext *C, bAnimContext *ac, ARegion *ar) 
+void graph_draw_channel_names(bContext *C, bAnimContext *ac, ARegion *ar)
 {
 	ListBase anim_data = {NULL, NULL};
 	bAnimListElem *ale;
 	int filter;
-	
+
 	View2D *v2d = &ar->v2d;
 	float y = 0.0f, height;
 	size_t items;
 	int i = 0;
-	
+
 	/* build list of channels to draw */
 	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
 	items = ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
-	
+
 	/* Update max-extent of channels here (taking into account scrollers):
 	 *  - this is done to allow the channel list to be scrollable, but must be done here
 	 *    to avoid regenerating the list again and/or also because channels list is drawn first
-	 *	- offset of ACHANNEL_HEIGHT*2 is added to the height of the channels, as first is for 
+	 *	- offset of ACHANNEL_HEIGHT*2 is added to the height of the channels, as first is for
 	 *	  start of list offset, and the second is as a correction for the scrollers.
 	 */
 	height = (float)((items * ACHANNEL_STEP(ac)) + (ACHANNEL_HEIGHT(ac) * 2));
 	UI_view2d_totRect_set(v2d, BLI_rcti_size_x(&ar->v2d.mask), height);
-	
+
 	/* loop through channels, and set up drawing depending on their type  */
 	{   /* first pass: just the standard GL-drawing for backdrop + text */
 		size_t channel_index = 0;
-		
+
 		y = (float)ACHANNEL_FIRST(ac);
-		
+
 		for (ale = anim_data.first, i = 0; ale; ale = ale->next, i++) {
 			const float yminc = (float)(y - ACHANNEL_HEIGHT_HALF(ac));
 			const float ymaxc = (float)(y + ACHANNEL_HEIGHT_HALF(ac));
-			
+
 			/* check if visible */
 			if (IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||
 			    IN_RANGE(ymaxc, v2d->cur.ymin, v2d->cur.ymax) )
@@ -1216,7 +1216,7 @@ void graph_draw_channel_names(bContext *C, bAnimContext *ac, ARegion *ar)
 				/* draw all channels using standard channel-drawing API */
 				ANIM_channel_draw(ac, ale, yminc, ymaxc, channel_index);
 			}
-			
+
 			/* adjust y-position for next one */
 			y -= ACHANNEL_STEP(ac);
 			channel_index++;
@@ -1225,17 +1225,17 @@ void graph_draw_channel_names(bContext *C, bAnimContext *ac, ARegion *ar)
 	{   /* second pass: widgets */
 		uiBlock *block = UI_block_begin(C, ar, __func__, UI_EMBOSS);
 		size_t channel_index = 0;
-		
+
 		y = (float)ACHANNEL_FIRST(ac);
-		
+
 		/* set blending again, as may not be set in previous step */
 		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 		glEnable(GL_BLEND);
-		
+
 		for (ale = anim_data.first, i = 0; ale; ale = ale->next, i++) {
 			const float yminc = (float)(y - ACHANNEL_HEIGHT_HALF(ac));
 			const float ymaxc = (float)(y + ACHANNEL_HEIGHT_HALF(ac));
-			
+
 			/* check if visible */
 			if (IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||
 			    IN_RANGE(ymaxc, v2d->cur.ymin, v2d->cur.ymax) )
@@ -1243,18 +1243,18 @@ void graph_draw_channel_names(bContext *C, bAnimContext *ac, ARegion *ar)
 				/* draw all channels using standard channel-drawing API */
 				ANIM_channel_draw_widgets(C, ac, ale, block, yminc, ymaxc, channel_index);
 			}
-			
+
 			/* adjust y-position for next one */
 			y -= ACHANNEL_STEP(ac);
 			channel_index++;
 		}
-		
+
 		UI_block_end(C, block);
 		UI_block_draw(C, block);
-		
+
 		glDisable(GL_BLEND);
 	}
-	
+
 	/* free tempolary channels */
 	ANIM_animdata_freelist(&anim_data);
 }