[Bf-blender-cvs] [d985aa7117d] newboolean: Ran make format.

[Howard Trickey]

Commit: d985aa7117d7fb395b985dad571f61d195ca043c
Author: Howard Trickey
Date:   Sun Jun 7 06:02:01 2020 -0400
Branches: newboolean
https://developer.blender.org/rBd985aa7117d7fb395b985dad571f61d195ca043c

Ran make format.

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

M	source/blender/blenlib/BLI_boolean.h
M	source/blender/bmesh/tools/bmesh_boolean.h
M	source/blender/editors/mesh/editmesh_intersect.c
M	tests/gtests/blenlib/BLI_boolean_test.cc

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

diff --git a/source/blender/blenlib/BLI_boolean.h b/source/blender/blenlib/BLI_boolean.h
index f23e59c8c8d..203526f5946 100644
--- a/source/blender/blenlib/BLI_boolean.h
+++ b/source/blender/blenlib/BLI_boolean.h
@@ -17,7 +17,6 @@
 #ifndef __BLI_BOOLEAN_H__
 #define __BLI_BOOLEAN_H__
 
-
 /** \file
  * \ingroup bli
  */
@@ -56,5 +55,4 @@ void BLI_boolean_trimesh_free(Boolean_trimesh_output *output);
 }
 #endif
 
-
 #endif /* __BLI_BOOLEAN_H__ */
diff --git a/source/blender/bmesh/tools/bmesh_boolean.h b/source/blender/bmesh/tools/bmesh_boolean.h
index 2551cb536e2..e246ac365b6 100644
--- a/source/blender/bmesh/tools/bmesh_boolean.h
+++ b/source/blender/bmesh/tools/bmesh_boolean.h
@@ -21,7 +21,6 @@
  * \ingroup bmesh
  */
 
-
 bool BM_mesh_boolean(BMesh *bm,
                      struct BMLoop *(*looptris)[3],
                      const int looptris_tot,
@@ -38,5 +37,4 @@ bool BM_mesh_boolean_knife(BMesh *bm,
                            const bool use_self,
                            const bool use_separate_all);
 
-
 #endif /* __BMESH_BOOLEAN_H__ */
diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c
index a5a67fde596..f9530770433 100644
--- a/source/blender/editors/mesh/editmesh_intersect.c
+++ b/source/blender/editors/mesh/editmesh_intersect.c
@@ -195,28 +195,23 @@ static int edbm_intersect_exec(bContext *C, wmOperator *op)
     }
 
     if (exact) {
-      has_isect = BM_mesh_boolean_knife(em->bm,
-                                        em->looptris,
-                                        em->tottri,
-                                        test_fn,
-                                        NULL,
-                                        use_self,
-                                        use_separate_all);
+      has_isect = BM_mesh_boolean_knife(
+          em->bm, em->looptris, em->tottri, test_fn, NULL, use_self, use_separate_all);
     }
     else {
       has_isect = BM_mesh_intersect(em->bm,
-                                  em->looptris,
-                                  em->tottri,
-                                  test_fn,
-                                  NULL,
-                                  use_self,
-                                  use_separate_all,
-                                  true,
-                                  true,
-                                  true,
-                                  true,
-                                  -1,
-                                  eps);
+                                    em->looptris,
+                                    em->tottri,
+                                    test_fn,
+                                    NULL,
+                                    use_self,
+                                    use_separate_all,
+                                    true,
+                                    true,
+                                    true,
+                                    true,
+                                    -1,
+                                    eps);
     }
 
     if (use_separate_cut) {
@@ -325,28 +320,23 @@ static int edbm_intersect_boolean_exec(bContext *C, wmOperator *op)
     }
 
     if (use_exact) {
-      has_isect = BM_mesh_boolean(em->bm,
-                                  em->looptris,
-                                  em->tottri,
-                                  test_fn,
-                                  NULL,
-                                  use_self,
-                                  boolean_operation);
+      has_isect = BM_mesh_boolean(
+          em->bm, em->looptris, em->tottri, test_fn, NULL, use_self, boolean_operation);
     }
     else {
       has_isect = BM_mesh_intersect(em->bm,
-                                  em->looptris,
-                                  em->tottri,
-                                  test_fn,
-                                  NULL,
-                                  false,
-                                  false,
-                                  true,
-                                  true,
-                                  false,
-                                  true,
-                                  boolean_operation,
-                                  eps);
+                                    em->looptris,
+                                    em->tottri,
+                                    test_fn,
+                                    NULL,
+                                    false,
+                                    false,
+                                    true,
+                                    true,
+                                    false,
+                                    true,
+                                    boolean_operation,
+                                    eps);
     }
 
     edbm_intersect_select(em, obedit->data, has_isect);
diff --git a/tests/gtests/blenlib/BLI_boolean_test.cc b/tests/gtests/blenlib/BLI_boolean_test.cc
index 41b7cbd10f1..f42148a073e 100644
--- a/tests/gtests/blenlib/BLI_boolean_test.cc
+++ b/tests/gtests/blenlib/BLI_boolean_test.cc
@@ -6,8 +6,8 @@
 #include <iostream>
 #include <sstream>
 
-#include "gmpxx.h"
 #include "MEM_guardedalloc.h"
+#include "gmpxx.h"
 
 #include "BLI_array.hh"
 #include "BLI_boolean.h"
@@ -19,7 +19,7 @@
  * then all the tris as vert index triples.
  */
 class BT_input {
-public:
+ public:
   BT_input(const char *spec)
   {
     std::istringstream ss(spec);
@@ -30,7 +30,7 @@ public:
     m_bti.tri = nullptr;
     hdrss >> m_bti.vert_len >> m_bti.tri_len;
     if (m_bti.vert_len > 0 && m_bti.tri_len > 0) {
-      m_bti.vert_coord = new float [m_bti.vert_len][3];
+      m_bti.vert_coord = new float[m_bti.vert_len][3];
       m_bti.tri = new int[m_bti.tri_len][3];
       int i = 0;
       while (i < m_bti.vert_len && getline(ss, line)) {
@@ -49,15 +49,16 @@ public:
 
   ~BT_input()
   {
-    delete [] m_bti.vert_coord;
-    delete [] m_bti.tri;
+    delete[] m_bti.vert_coord;
+    delete[] m_bti.tri;
   }
 
-  Boolean_trimesh_input *input() {
+  Boolean_trimesh_input *input()
+  {
     return &m_bti;
   }
 
-private:
+ private:
   Boolean_trimesh_input m_bti;
 };