Merge branch 'master' into blender2.8

1 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 44c8f581755..0982f91f825 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -200,16 +200,16 @@ typedef struct TransSeq {
 /* for NLA transform (stored in td->extra pointer) */
 typedef struct TransDataNla {
 	ID *id;						/* ID-block NLA-data is attached to */
-	
+
 	struct NlaTrack *oldTrack;	/* Original NLA-Track that the strip belongs to */
 	struct NlaTrack *nlt;		/* Current NLA-Track that the strip belongs to */
-	
+
 	struct NlaStrip *strip;		/* NLA-strip this data represents */
-	
+
 	/* dummy values for transform to write in - must have 3 elements... */
 	float h1[3];				/* start handle */
 	float h2[3];				/* end handle */
-	
+
 	int trackIndex;				/* index of track that strip is currently in */
 	int handle;					/* handle-index: 0 for dummy entry, -1 for start, 1 for end, 2 for both ends */
 } TransDataNla;
@@ -507,7 +507,7 @@ typedef struct TransInfo {
 	short		twflag;			/* backup from view3d, to restore on end */
 
 	short		prop_mode;
-	
+
 	short		mirror;
 
 	float		values[4];