[Bf-blender-cvs] [b28bdfd] dyntopo_holes: Cleanup: minor edits

[Campbell Barton]

Commit: b28bdfdff0c5484544c5e338e42d4f2121ef7cd3
Author: Campbell Barton
Date:   Thu Oct 2 19:06:22 2014 +0200
Branches: dyntopo_holes
https://developer.blender.org/rBb28bdfdff0c5484544c5e338e42d4f2121ef7cd3

Cleanup: minor edits

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

M	source/blender/blenkernel/BKE_pbvh.h
M	source/blender/blenkernel/intern/pbvh_bmesh.c
M	source/blender/editors/sculpt_paint/sculpt.c
M	source/blender/makesdna/DNA_scene_types.h

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

diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 8599f9a..3d12483 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -142,7 +142,7 @@ void BKE_pbvh_bmesh_detail_size_set(PBVH *pbvh, float detail_size);
 typedef enum {
 	PBVH_Subdivide = (1 << 0),
 	PBVH_Collapse = (1 << 1),
-	PBVH_TopologyGenus = (1 << 2)
+	PBVH_TopologyGenus = (1 << 2),
 } PBVHTopologyUpdateMode;
 
 bool BKE_pbvh_bmesh_update_topology(PBVH *bvh, PBVHTopologyUpdateMode mode,
diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index 085bfa4..f142098 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -716,7 +716,7 @@ static void pbvh_bmesh_delete_vert_face(PBVH *bvh, BMVert *v, BMFace *f_del, GSe
 	BM_face_kill(bvh->bm, f_del);
 	
 	/* Check if any of the face's edges are now unused by any
- * face, if so delete them */
+	 * face, if so delete them */
 	for (j = 0; j < 3; j++) {
 		if (BM_edge_is_wire(e_tri[j]))
 			BM_edge_kill(bvh->bm, e_tri[j]);
@@ -765,8 +765,8 @@ static void close_vert_queue_create(EdgeQueueContext *eq_ctx,
 
 		/* Check leaf nodes marked for topology update */
 		if ((node->flag & PBVH_Leaf) &&
-			(node->flag & PBVH_UpdateTopology) &&
-			!(node->flag & PBVH_FullyHidden))
+		    (node->flag & PBVH_UpdateTopology) &&
+		    !(node->flag & PBVH_FullyHidden))
 		{
 			GSetIterator gs_iter;
 
@@ -1231,15 +1231,15 @@ static void pbvh_bmesh_collapse_close_verts(EdgeQueueContext *eq_ctx,
 			continue;
 		}
 
-		/*
-		 * Note, maybe this should be done after deletion of the vertices?
+		/* Note, maybe this should be done after deletion of the vertices? */
+#if 0
 		if (total_edge_verts2 > total_edge_verts1) {
 			pbvh_bridge_loops(bvh, &edge_verts_v1, &edge_verts_v2, total_edge_verts1, total_edge_verts2, deleted_verts);
 		}
 		else {
 			pbvh_bridge_loops(bvh, &edge_verts_v2, &edge_verts_v1, total_edge_verts2, total_edge_verts1, deleted_verts);
 		}
-		*/
+#endif
 		
 
 		/* Remove the faces */
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index d2ab638..9c8c3c2 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -3004,7 +3004,7 @@ static void sculpt_topology_update(Sculpt *sd, Object *ob, Brush *brush)
 		{
 			mode |= PBVH_Collapse;
 		}
-		
+
 		if (sd->flags & SCULPT_DYNTOPO_GENUS_CHANGE) {
 			mode |= PBVH_TopologyGenus;
 		}
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 8ed26ca..ce032bf 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1708,9 +1708,9 @@ typedef enum SculptFlags {
 
 	/* If set, dynamic-topology detail size will be constant in object space */
 	SCULPT_DYNTOPO_DETAIL_CONSTANT = (1 << 13),
-	
+
 	/* If set, dynamic-topology brushes will connect surfaces that come close together */
-	SCULPT_DYNTOPO_GENUS_CHANGE = (1 << 14)
+	SCULPT_DYNTOPO_GENUS_CHANGE = (1 << 14),
 } SculptFlags;
 
 typedef enum ImagePaintMode {