Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/bmesh/operators/bmo_fill_attribute.c
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/bmesh/operators/bmo_fill_attribute.c')
-rw-r--r--source/blender/bmesh/operators/bmo_fill_attribute.c215
1 files changed, 107 insertions, 108 deletions
diff --git a/source/blender/bmesh/operators/bmo_fill_attribute.c b/source/blender/bmesh/operators/bmo_fill_attribute.c
index b724f6202bd..1e226beffc7 100644
--- a/source/blender/bmesh/operators/bmo_fill_attribute.c
+++ b/source/blender/bmesh/operators/bmo_fill_attribute.c
@@ -32,15 +32,15 @@
*/
static bool bm_loop_is_all_radial_tag(BMLoop *l)
{
- BMLoop *l_iter;
- l_iter = l->radial_next;
- do {
- if (BM_elem_flag_test(l_iter->f, BM_ELEM_TAG) == 0) {
- return false;
- }
- } while ((l_iter = l_iter->radial_next) != l);
-
- return true;
+ BMLoop *l_iter;
+ l_iter = l->radial_next;
+ do {
+ if (BM_elem_flag_test(l_iter->f, BM_ELEM_TAG) == 0) {
+ return false;
+ }
+ } while ((l_iter = l_iter->radial_next) != l);
+
+ return true;
}
/**
@@ -48,122 +48,121 @@ static bool bm_loop_is_all_radial_tag(BMLoop *l)
*/
static bool bm_loop_is_face_untag(const BMLoop *l, void *UNUSED(user_data))
{
- return (BM_elem_flag_test(l->f, BM_ELEM_TAG) == 0);
+ return (BM_elem_flag_test(l->f, BM_ELEM_TAG) == 0);
}
/**
* Copy all attributes from adjacent untagged faces.
*/
-static void bm_face_copy_shared_all(
- BMesh *bm, BMLoop *l,
- const bool use_normals, const bool use_data)
+static void bm_face_copy_shared_all(BMesh *bm,
+ BMLoop *l,
+ const bool use_normals,
+ const bool use_data)
{
- BMLoop *l_other = l->radial_next;
- BMFace *f = l->f, *f_other;
- while (BM_elem_flag_test(l_other->f, BM_ELEM_TAG)) {
- l_other = l_other->radial_next;
- }
- f_other = l_other->f;
-
- if (use_data) {
- /* copy face-attrs */
- BM_elem_attrs_copy(bm, bm, f_other, f);
-
- /* copy loop-attrs */
- BM_face_copy_shared(bm, f, bm_loop_is_face_untag, NULL);
- }
-
- if (use_normals) {
- /* copy winding (flipping) */
- if (l->v == l_other->v) {
- BM_face_normal_flip(bm, f);
- }
- }
+ BMLoop *l_other = l->radial_next;
+ BMFace *f = l->f, *f_other;
+ while (BM_elem_flag_test(l_other->f, BM_ELEM_TAG)) {
+ l_other = l_other->radial_next;
+ }
+ f_other = l_other->f;
+
+ if (use_data) {
+ /* copy face-attrs */
+ BM_elem_attrs_copy(bm, bm, f_other, f);
+
+ /* copy loop-attrs */
+ BM_face_copy_shared(bm, f, bm_loop_is_face_untag, NULL);
+ }
+
+ if (use_normals) {
+ /* copy winding (flipping) */
+ if (l->v == l_other->v) {
+ BM_face_normal_flip(bm, f);
+ }
+ }
}
/**
* Flood fill attributes.
*/
-static uint bmesh_face_attribute_fill(
- BMesh *bm,
- const bool use_normals, const bool use_data)
+static uint bmesh_face_attribute_fill(BMesh *bm, const bool use_normals, const bool use_data)
{
- BLI_LINKSTACK_DECLARE(loop_queue_prev, BMLoop *);
- BLI_LINKSTACK_DECLARE(loop_queue_next, BMLoop *);
-
- BMFace *f;
- BMIter iter;
- BMLoop *l;
-
- uint face_tot = 0;
-
-
- BLI_LINKSTACK_INIT(loop_queue_prev);
- BLI_LINKSTACK_INIT(loop_queue_next);
-
- BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
- if (BM_elem_flag_test(f, BM_ELEM_TAG)) {
- BMLoop *l_iter, *l_first;
- l_iter = l_first = BM_FACE_FIRST_LOOP(f);
- do {
- if (bm_loop_is_all_radial_tag(l_iter) == false) {
- BLI_LINKSTACK_PUSH(loop_queue_prev, l_iter);
- }
- } while ((l_iter = l_iter->next) != l_first);
- }
- }
-
- while (BLI_LINKSTACK_SIZE(loop_queue_prev)) {
- while ((l = BLI_LINKSTACK_POP(loop_queue_prev))) {
- /* check we're still un-assigned */
- if (BM_elem_flag_test(l->f, BM_ELEM_TAG)) {
- BMLoop *l_iter;
-
- BM_elem_flag_disable(l->f, BM_ELEM_TAG);
-
- l_iter = l->next;
- do {
- BMLoop *l_radial_iter = l_iter->radial_next;
- if (l_radial_iter != l_iter) {
- do {
- if (BM_elem_flag_test(l_radial_iter->f, BM_ELEM_TAG)) {
- BLI_LINKSTACK_PUSH(loop_queue_next, l_radial_iter);
- }
- } while ((l_radial_iter = l_radial_iter->radial_next) != l_iter);
- }
- } while ((l_iter = l_iter->next) != l);
-
- /* do last because of face flipping */
- bm_face_copy_shared_all(bm, l,
- use_normals, use_data);
- face_tot += 1;
- }
- }
-
- BLI_LINKSTACK_SWAP(loop_queue_prev, loop_queue_next);
- }
-
- BLI_LINKSTACK_FREE(loop_queue_prev);
- BLI_LINKSTACK_FREE(loop_queue_next);
-
- return face_tot;
+ BLI_LINKSTACK_DECLARE(loop_queue_prev, BMLoop *);
+ BLI_LINKSTACK_DECLARE(loop_queue_next, BMLoop *);
+
+ BMFace *f;
+ BMIter iter;
+ BMLoop *l;
+
+ uint face_tot = 0;
+
+ BLI_LINKSTACK_INIT(loop_queue_prev);
+ BLI_LINKSTACK_INIT(loop_queue_next);
+
+ BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
+ if (BM_elem_flag_test(f, BM_ELEM_TAG)) {
+ BMLoop *l_iter, *l_first;
+ l_iter = l_first = BM_FACE_FIRST_LOOP(f);
+ do {
+ if (bm_loop_is_all_radial_tag(l_iter) == false) {
+ BLI_LINKSTACK_PUSH(loop_queue_prev, l_iter);
+ }
+ } while ((l_iter = l_iter->next) != l_first);
+ }
+ }
+
+ while (BLI_LINKSTACK_SIZE(loop_queue_prev)) {
+ while ((l = BLI_LINKSTACK_POP(loop_queue_prev))) {
+ /* check we're still un-assigned */
+ if (BM_elem_flag_test(l->f, BM_ELEM_TAG)) {
+ BMLoop *l_iter;
+
+ BM_elem_flag_disable(l->f, BM_ELEM_TAG);
+
+ l_iter = l->next;
+ do {
+ BMLoop *l_radial_iter = l_iter->radial_next;
+ if (l_radial_iter != l_iter) {
+ do {
+ if (BM_elem_flag_test(l_radial_iter->f, BM_ELEM_TAG)) {
+ BLI_LINKSTACK_PUSH(loop_queue_next, l_radial_iter);
+ }
+ } while ((l_radial_iter = l_radial_iter->radial_next) != l_iter);
+ }
+ } while ((l_iter = l_iter->next) != l);
+
+ /* do last because of face flipping */
+ bm_face_copy_shared_all(bm, l, use_normals, use_data);
+ face_tot += 1;
+ }
+ }
+
+ BLI_LINKSTACK_SWAP(loop_queue_prev, loop_queue_next);
+ }
+
+ BLI_LINKSTACK_FREE(loop_queue_prev);
+ BLI_LINKSTACK_FREE(loop_queue_next);
+
+ return face_tot;
}
-void bmo_face_attribute_fill_exec(BMesh *bm, BMOperator *op)
+void bmo_face_attribute_fill_exec(BMesh *bm, BMOperator *op)
{
- const bool use_normals = BMO_slot_bool_get(op->slots_in, "use_normals");
- const bool use_data = BMO_slot_bool_get(op->slots_in, "use_data");
+ const bool use_normals = BMO_slot_bool_get(op->slots_in, "use_normals");
+ const bool use_data = BMO_slot_bool_get(op->slots_in, "use_data");
- int face_tot;
+ int face_tot;
- BM_mesh_elem_hflag_disable_all(bm, BM_FACE, BM_ELEM_TAG, false);
- BMO_slot_buffer_hflag_enable(bm, op->slots_in, "faces", BM_FACE, BM_ELEM_TAG, false); /* do inline */
+ BM_mesh_elem_hflag_disable_all(bm, BM_FACE, BM_ELEM_TAG, false);
+ BMO_slot_buffer_hflag_enable(
+ bm, op->slots_in, "faces", BM_FACE, BM_ELEM_TAG, false); /* do inline */
- /* now we can copy adjacent data */
- face_tot = bmesh_face_attribute_fill(bm, use_normals, use_data);
+ /* now we can copy adjacent data */
+ face_tot = bmesh_face_attribute_fill(bm, use_normals, use_data);
- if (face_tot != BMO_slot_buffer_count(op->slots_in, "faces")) {
- /* any remaining tags will be skipped */
- BMO_slot_buffer_from_enabled_hflag(bm, op, op->slots_out, "faces_fail.out", BM_FACE, BM_ELEM_TAG);
- }
+ if (face_tot != BMO_slot_buffer_count(op->slots_in, "faces")) {
+ /* any remaining tags will be skipped */
+ BMO_slot_buffer_from_enabled_hflag(
+ bm, op, op->slots_out, "faces_fail.out", BM_FACE, BM_ELEM_TAG);
+ }
}