Merge branch 'master' into blender2.8

4 files changed, 12 insertions, 12 deletions

diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index bb3c939f161..7bea0363a04 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -188,7 +188,7 @@ BMesh *BM_mesh_create(
 /**
  * \brief BMesh Free Mesh Data
  *
- *	Frees a BMesh structure.
+ * Frees a BMesh structure.
  *
  * \note frees mesh, but not actual BMesh struct
  */
@@ -297,7 +297,7 @@ void BM_mesh_clear(BMesh *bm)
 /**
  * \brief BMesh Free Mesh
  *
- *	Frees a BMesh data and its structure.
+ * Frees a BMesh data and its structure.
  */
 void BM_mesh_free(BMesh *bm)
 {
diff --git a/source/blender/bmesh/intern/bmesh_query.c b/source/blender/bmesh/intern/bmesh_query.c
index 59711670334..c446ce5ab49 100644
--- a/source/blender/bmesh/intern/bmesh_query.c
+++ b/source/blender/bmesh/intern/bmesh_query.c
@@ -792,7 +792,7 @@ bool BM_vert_edge_pair(BMVert *v, BMEdge **r_e_a, BMEdge **r_e_b)
 }
 
 /**
- *	Returns the number of edges around this vertex.
+ * Returns the number of edges around this vertex.
  */
 int BM_vert_edge_count(const BMVert *v)
 {
@@ -817,7 +817,7 @@ int BM_vert_edge_count_nonwire(const BMVert *v)
 	return count;
 }
 /**
- *	Returns the number of faces around this edge
+ * Returns the number of faces around this edge
  */
 int BM_edge_face_count(const BMEdge *e)
 {
@@ -1311,7 +1311,7 @@ bool BM_edge_share_face_check(BMEdge *e1, BMEdge *e2)
 }
 
 /**
- *	Test if e1 shares any quad faces with e2
+ * Test if e1 shares any quad faces with e2
  */
 bool BM_edge_share_quad_check(BMEdge *e1, BMEdge *e2)
 {
@@ -1334,7 +1334,7 @@ bool BM_edge_share_quad_check(BMEdge *e1, BMEdge *e2)
 }
 
 /**
- *	Tests to see if e1 shares a vertex with e2
+ * Tests to see if e1 shares a vertex with e2
  */
 bool BM_edge_share_vert_check(BMEdge *e1, BMEdge *e2)
 {
@@ -1345,7 +1345,7 @@ bool BM_edge_share_vert_check(BMEdge *e1, BMEdge *e2)
 }
 
 /**
- *	Return the shared vertex between the two edges or NULL
+ * Return the shared vertex between the two edges or NULL
  */
 BMVert *BM_edge_share_vert(BMEdge *e1, BMEdge *e2)
 {
diff --git a/source/blender/bmesh/intern/bmesh_structure.c b/source/blender/bmesh/intern/bmesh_structure.c
index ff744ae1a42..8f9b4274336 100644
--- a/source/blender/bmesh/intern/bmesh_structure.c
+++ b/source/blender/bmesh/intern/bmesh_structure.c
@@ -37,7 +37,7 @@
 #include "intern/bmesh_private.h"
 
 /**
- *	MISC utility functions.
+ * MISC utility functions.
  */
 
 void bmesh_disk_vert_swap(BMEdge *e, BMVert *v_dst, BMVert *v_src)
diff --git a/source/blender/bmesh/intern/bmesh_walkers.c b/source/blender/bmesh/intern/bmesh_walkers.c
index 77e9d441bbb..44692b760b6 100644
--- a/source/blender/bmesh/intern/bmesh_walkers.c
+++ b/source/blender/bmesh/intern/bmesh_walkers.c
@@ -190,10 +190,10 @@ void *BMW_current_state(BMWalker *walker)
 	if (currentstate) {
 		/* Automatic update of depth. For most walkers that
 		 * follow the standard "Step" pattern of:
-		 *  - read current state
-		 *  - remove current state
-		 *  - push new states
-		 *  - return walk result from just-removed current state
+		 * - read current state
+		 * - remove current state
+		 * - push new states
+		 * - return walk result from just-removed current state
 		 * this simple automatic update should keep track of depth
 		 * just fine. Walkers that deviate from that pattern may
 		 * need to manually update the depth if they care about