Merge branch 'master' into blender2.8

1 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/blenkernel/nla_private.h b/source/blender/blenkernel/nla_private.h
index c441f00ceaa..87f4e37e86d 100644
--- a/source/blender/blenkernel/nla_private.h
+++ b/source/blender/blenkernel/nla_private.h
@@ -40,13 +40,13 @@ struct Depsgraph;
 /* used for list of strips to accumulate at current time */
 typedef struct NlaEvalStrip {
 	struct NlaEvalStrip *next, *prev;
-	
+
 	NlaTrack *track;            /* track that this strip belongs to */
 	NlaStrip *strip;            /* strip that's being used */
-	
+
 	short track_index;          /* the index of the track within the list */
 	short strip_mode;           /* which end of the strip are we looking at */
-	
+
 	float strip_time;           /* time at which which strip is being evaluated */
 } NlaEvalStrip;
 
@@ -56,7 +56,7 @@ enum eNlaEvalStrip_StripMode {
 	NES_TIME_BEFORE = -1,
 	NES_TIME_WITHIN,
 	NES_TIME_AFTER,
-	
+
 	/* transition-strip evaluations */
 	NES_TIME_TRANSITION_START,
 	NES_TIME_TRANSITION_END,
@@ -67,11 +67,11 @@ enum eNlaEvalStrip_StripMode {
 // TODO: maybe this will be used as the 'cache' stuff needed for editable values too?
 typedef struct NlaEvalChannel {
 	struct NlaEvalChannel *next, *prev;
-	
+
 	PointerRNA ptr;         /* pointer to struct containing property to use */
 	PropertyRNA *prop;      /* RNA-property type to use (should be in the struct given) */
 	int index;              /* array index (where applicable) */
-	
+
 	float value;            /* value of this channel */
 } NlaEvalChannel;