Merge branch 'blender2.8' into soc-2018-bevel

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h
index 8159aae1ab8..5ff1d2c970f 100644
--- a/source/blender/bmesh/bmesh_class.h
+++ b/source/blender/bmesh/bmesh_class.h
@@ -121,7 +121,7 @@ typedef struct BMEdge {
 	/* the list of loops around the edge (use l->radial_prev/next)
 	 * to access the other loops using the edge */
 	struct BMLoop *l;
-	
+
 	/* disk cycle pointers
 	 * relative data: d1 indicates indicates the next/prev edge around vertex v1 and d2 does the same for v2 */
 	BMDiskLink v1_disk_link, v2_disk_link;
@@ -231,7 +231,7 @@ typedef struct BMesh {
 
 	int toolflag_index;
 	struct BMOperator *currentop;
-	
+
 	CustomData vdata, edata, ldata, pdata;
 
 #ifdef USE_BMESH_HOLES
@@ -246,10 +246,10 @@ typedef struct BMesh {
 	 * make sure they're in sync!
 	 * Only use when the edit mesh cant be accessed - campbell */
 	short selectmode;
-	
+
 	/* ID of the shape key this bmesh came from */
 	int shapenr;
-	
+
 	int totflags;
 	ListBase selected;