[Bf-blender-cvs] [12551299326] soc-2018-bevel: Merge branch 'blender2.8' into soc-2018-bevel

[Rohan Rathi]

Commit: 12551299326fea494020d19708220a9d31dd11d0
Author: Rohan Rathi
Date:   Mon Jun 11 21:03:07 2018 +0530
Branches: soc-2018-bevel
https://developer.blender.org/rB12551299326fea494020d19708220a9d31dd11d0

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

===================================================================



===================================================================

diff --cc source/blender/bmesh/tools/bmesh_bevel.c
index 18039261735,33380cee18e..39ca5a2d1ca
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@@ -151,10 -150,8 +151,10 @@@ typedef struct BoundVert 
  	Profile profile;    /* edge profile between this and next BoundVert */
  	bool any_seam;      /* are any of the edges attached here seams? */
  	bool visited;       /* used during delta adjust pass */
 +	int add_seam;
 +	int sharp_len;
  //	int _pad;
- } BoundVert;	
+ } BoundVert;
  
  /* Mesh structure replacing a vertex */
  typedef struct VMesh {