Merge branch 'master' into blender2.8

1 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c
index a2046985a36..239ab5f8206 100644
--- a/source/blender/editors/animation/anim_draw.c
+++ b/source/blender/editors/animation/anim_draw.c
@@ -91,7 +91,7 @@ void ANIM_draw_cfra_number(const bContext *C, View2D *v2d, short flag)
 	GPU_matrix_scale_2f(1.0f / xscale, 1.0f);
 
 	/* get timecode string
-	 *	- padding on str-buf passed so that it doesn't sit on the frame indicator
+	 * - padding on str-buf passed so that it doesn't sit on the frame indicator
 	 */
 	if (show_time) {
 		BLI_timecode_string_from_time(&numstr[2], sizeof(numstr) - 2, 0, FRA2TIME(cfra), FPS, U.timecode_style);
@@ -305,8 +305,8 @@ static short bezt_nlamapping_apply(KeyframeEditData *ked, BezTriple *bezt)
 
 
 /* Apply/Unapply NLA mapping to all keyframes in the nominated F-Curve
- *	- restore = whether to map points back to non-mapped time
- *  - only_keys = whether to only adjust the location of the center point of beztriples
+ * - restore = whether to map points back to non-mapped time
+ * - only_keys = whether to only adjust the location of the center point of beztriples
  */
 void ANIM_nla_mapping_apply_fcurve(AnimData *adt, FCurve *fcu, bool restore, bool only_keys)
 {
@@ -314,8 +314,8 @@ void ANIM_nla_mapping_apply_fcurve(AnimData *adt, FCurve *fcu, bool restore, boo
 	KeyframeEditFunc map_cb;
 
 	/* init edit data
-	 *	- AnimData is stored in 'data'
-	 *	- only_keys is stored in 'i1'
+	 * - AnimData is stored in 'data'
+	 * - only_keys is stored in 'i1'
 	 */
 	ked.data = (void *)adt;
 	ked.i1 = (int)only_keys;