Cleanup: remove redundant doxygen \file argument
[blender.git] / source / blender / bmesh / operators / bmo_planar_faces.c
index 2856d3d18a6e9b50429ae4a75568cd6538c4a0b2..999191e57cf73da5ffd58cc38993b53a1810f22d 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/bmesh/operators/bmo_planar_faces.c
- *  \ingroup bmesh
+/** \file \ingroup bmesh
  *
  * Iteratively flatten 4+ sided faces.
  */
@@ -67,17 +62,17 @@ void bmo_planar_faces_exec(BMesh *bm, BMOperator *op)
                        continue;
                }
 
-               BM_face_calc_center_mean_weighted(f, faces_center[i]);
+               BM_face_calc_center_median_weighted(f, faces_center[i]);
 
                l_iter = l_first = BM_FACE_FIRST_LOOP(f);
                do {
-                       if (!BMO_elem_flag_test(bm, l_iter->v, ELE_VERT_ADJUST)) {
-                               BMO_elem_flag_enable(bm, l_iter->v, ELE_VERT_ADJUST);
+                       if (!BMO_vert_flag_test(bm, l_iter->v, ELE_VERT_ADJUST)) {
+                               BMO_vert_flag_enable(bm, l_iter->v, ELE_VERT_ADJUST);
                                shared_vert_num += 1;
                        }
                } while ((l_iter = l_iter->next) != l_first);
 
-               BMO_elem_flag_enable(bm, f, ELE_FACE_ADJUST);
+               BMO_face_flag_enable(bm, f, ELE_FACE_ADJUST);
        }
 
        vert_accum_pool = BLI_mempool_create(sizeof(struct VertAccum), 0, 512, BLI_MEMPOOL_NOP);
@@ -91,17 +86,17 @@ void bmo_planar_faces_exec(BMesh *bm, BMOperator *op)
                        BMLoop *l_iter, *l_first;
                        float plane[4];
 
-                       if (!BMO_elem_flag_test(bm, f, ELE_FACE_ADJUST)) {
+                       if (!BMO_face_flag_test(bm, f, ELE_FACE_ADJUST)) {
                                continue;
                        }
-                       BMO_elem_flag_disable(bm, f, ELE_FACE_ADJUST);
+                       BMO_face_flag_disable(bm, f, ELE_FACE_ADJUST);
 
                        BLI_assert(f->len != 3);
 
                        /* keep original face data (else we 'move' the face) */
 #if 0
                        BM_face_normal_update(f);
-                       BM_face_calc_center_mean_weighted(f, f_center);
+                       BM_face_calc_center_median_weighted(f, f_center);
 #endif
 
                        plane_from_point_normal_v3(plane, faces_center[i], f->no);
@@ -130,7 +125,7 @@ void bmo_planar_faces_exec(BMesh *bm, BMOperator *op)
                        BMIter iter;
 
                        if (len_squared_v3v3(v->co, va->co) > eps_sq) {
-                               BMO_elem_flag_enable(bm, v, ELE_VERT_ADJUST);
+                               BMO_vert_flag_enable(bm, v, ELE_VERT_ADJUST);
                                interp_v3_v3v3(v->co, v->co, va->co, fac);
                                changed = true;
                        }
@@ -138,7 +133,7 @@ void bmo_planar_faces_exec(BMesh *bm, BMOperator *op)
                        /* tag for re-calculation */
                        BM_ITER_ELEM (f, &iter, v, BM_FACES_OF_VERT) {
                                if (f->len != 3) {
-                                       BMO_elem_flag_enable(bm, f, ELE_FACE_ADJUST);
+                                       BMO_face_flag_enable(bm, f, ELE_FACE_ADJUST);
                                }
                        }
                }