Merge branch 'master' into blender2.8

Conflicts:
	intern/cycles/blender/addon/ui.py
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/particle.c
	source/blender/blenkernel/intern/particle_distribute.c
	source/blender/blenkernel/intern/texture.c
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/physics/particle_edit.c
	source/blender/editors/physics/particle_object.c
	source/blender/editors/transform/transform_snap_object.c

1 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 0ed1dffcafb..4dc1c8a9f00 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -1849,11 +1849,11 @@ static void build_boundary(BevelParams *bp, BevVert *bv, bool construct)
 	do {
 		BLI_assert(e->is_bev);
 		/* Make the BoundVert for the right side of e; other side will be made
-		* when the beveled edge to the left of e is handled.
-		* Analyze edges until next beveled edge.
-		* They are either "in plane" (preceding and subsequent faces are coplanar)
-		* or not. The "non-in-plane" edges effect silhouette and we prefer to slide
-		* along one of those if possible. */
+		 * when the beveled edge to the left of e is handled.
+		 * Analyze edges until next beveled edge.
+		 * They are either "in plane" (preceding and subsequent faces are coplanar)
+		 * or not. The "non-in-plane" edges effect silhouette and we prefer to slide
+		 * along one of those if possible. */
 		nip = nnip = 0;        /* counts of in-plane / not-in-plane */
 		enip = eip = NULL;     /* representatives of each */
 		for (e2 = e->next; !e2->is_bev; e2 = e2->next) {