Merge branch 'master' into blender2.8

1 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c
index 444438a230c..121a21293f0 100644
--- a/source/blender/makesrna/intern/rna_nla.c
+++ b/source/blender/makesrna/intern/rna_nla.c
@@ -145,11 +145,11 @@ static void rna_NlaStrip_start_frame_set(PointerRNA *ptr, float value)
 	NlaStrip *data = (NlaStrip *)ptr->data;
 
 	/* clamp value to lie within valid limits
-	 *	- cannot start past the end of the strip + some flexibility threshold
-	 *	- cannot start before the previous strip (if present) ends
-	 *		-> but if it was a transition, we could go up to the start of the strip + some flexibility threshold
-	 *		as long as we re-adjust the transition afterwards
-	 *	- minimum frame is -MAXFRAME so that we don't get clipping on frame 0
+	 * - cannot start past the end of the strip + some flexibility threshold
+	 * - cannot start before the previous strip (if present) ends
+	 *   -> but if it was a transition, we could go up to the start of the strip + some flexibility threshold
+	 *   as long as we re-adjust the transition afterwards
+	 * - minimum frame is -MAXFRAME so that we don't get clipping on frame 0
 	 */
 	if (data->prev) {
 		if (data->prev->type == NLASTRIP_TYPE_TRANSITION) {
@@ -173,11 +173,11 @@ static void rna_NlaStrip_end_frame_set(PointerRNA *ptr, float value)
 	NlaStrip *data = (NlaStrip *)ptr->data;
 
 	/* clamp value to lie within valid limits
-	 *	- must not have zero or negative length strip, so cannot start before the first frame
-	 *	  + some minimum-strip-length threshold
-	 *	- cannot end later than the start of the next strip (if present)
-	 *		-> but if it was a transition, we could go up to the start of the end - some flexibility threshold
-	 *		as long as we re-adjust the transition afterwards
+	 * - must not have zero or negative length strip, so cannot start before the first frame
+	 *   + some minimum-strip-length threshold
+	 * - cannot end later than the start of the next strip (if present)
+	 *   -> but if it was a transition, we could go up to the start of the end - some flexibility threshold
+	 *   as long as we re-adjust the transition afterwards
 	 */
 	if (data->next) {
 		if (data->next->type == NLASTRIP_TYPE_TRANSITION) {
@@ -399,7 +399,7 @@ static NlaStrip *rna_NlaStrip_new(ID *id, NlaTrack *track, Main *bmain, bContext
 
 	/* create dummy AnimData block so that BKE_nlastrip_validate_name()
 	 * can be used to ensure a valid name, as we don't have one here...
-	 *  - only the nla_tracks list is needed there, which we aim to reverse engineer here...
+	 * - only the nla_tracks list is needed there, which we aim to reverse engineer here...
 	 */
 	{
 		AnimData adt = {NULL};