From 909665a0d4ed23620afc537c583a6e84cdee50b9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 1 May 2019 11:09:22 +1000 Subject: ClangFormat: run with ReflowComments on source/ Prepare for enabling ReflowComments. --- source/blender/bmesh/intern/bmesh_core.c | 4 ++-- source/blender/bmesh/intern/bmesh_log.c | 4 ++-- source/blender/bmesh/intern/bmesh_mesh.c | 4 ++-- source/blender/bmesh/intern/bmesh_operator_api.h | 2 +- source/blender/bmesh/intern/bmesh_operators.c | 2 +- source/blender/bmesh/intern/bmesh_polygon.c | 4 ++-- source/blender/bmesh/intern/bmesh_walkers_impl.c | 4 ++-- source/blender/bmesh/operators/bmo_fill_grid.c | 2 +- source/blender/bmesh/operators/bmo_removedoubles.c | 2 +- source/blender/bmesh/operators/bmo_subdivide.c | 4 ++-- source/blender/bmesh/tools/bmesh_bevel.c | 2 +- source/blender/bmesh/tools/bmesh_decimate_collapse.c | 2 +- source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) (limited to 'source/blender/bmesh') diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index dfea4cbf7c0..6ece32e57e8 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -1575,7 +1575,7 @@ BMFace *bmesh_kernel_split_face_make_edge(BMesh *bm, } else { /* this code is not significant until holes actually work */ - //printf("warning: call to split face euler without holes argument; holes will be tossed.\n"); + // printf("warning: call to split face euler without holes argument; holes will be tossed.\n"); for (lst = f->loops.last; lst != f->loops.first; lst = lst2) { lst2 = lst->prev; BLI_mempool_free(bm->looplistpool, lst); @@ -1717,7 +1717,7 @@ BMVert *bmesh_kernel_split_edge_make_vert(BMesh *bm, BMVert *tv, BMEdge *e, BMEd /* verify loop->v and loop->next->v pointers for e */ for (i = 0, l = e->l; i < radlen; i++, l = l->radial_next) { BMESH_ASSERT(l->e == e); - //BMESH_ASSERT(l->radial_next == l); + // BMESH_ASSERT(l->radial_next == l); BMESH_ASSERT(!(l->prev->e != e_new && l->next->e != e_new)); edok = BM_verts_in_edge(l->v, l->next->v, e); diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c index e6696236fac..8cbbf765f66 100644 --- a/source/blender/bmesh/intern/bmesh_log.c +++ b/source/blender/bmesh/intern/bmesh_log.c @@ -730,8 +730,8 @@ void BM_log_entry_drop(BMLogEntry *entry) * Also, design wise, a first entry should not have any deleted vertices since it * should not have anything to delete them -from- */ - //bm_log_id_ghash_release(log, entry->deleted_faces); - //bm_log_id_ghash_release(log, entry->deleted_verts); + // bm_log_id_ghash_release(log, entry->deleted_faces); + // bm_log_id_ghash_release(log, entry->deleted_verts); } else if (!entry->next) { /* Release IDs of elements that are added by this entry. Since diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index aad33d8c9c1..cb10ec9d701 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -954,11 +954,11 @@ static void bm_mesh_loops_calc_normals(BMesh *bm, /* printf("Invalid clnors in this fan!\n"); */ while ((clnor = BLI_SMALLSTACK_POP(clnors))) { - //print_v2("org clnor", clnor); + // print_v2("org clnor", clnor); clnor[0] = (short)clnors_avg[0]; clnor[1] = (short)clnors_avg[1]; } - //print_v2("new clnors", clnors_avg); + // print_v2("new clnors", clnors_avg); } else { /* We still have to consume the stack! */ diff --git a/source/blender/bmesh/intern/bmesh_operator_api.h b/source/blender/bmesh/intern/bmesh_operator_api.h index 5085eb801ce..3b543835586 100644 --- a/source/blender/bmesh/intern/bmesh_operator_api.h +++ b/source/blender/bmesh/intern/bmesh_operator_api.h @@ -628,7 +628,7 @@ void BMO_slot_buffer_from_all(BMesh *bm, * don't directly access. */ typedef struct BMOIter { BMOpSlot *slot; - int cur; //for arrays + int cur; // for arrays GHashIterator giter; void **val; char restrictmask; /* bitwise '&' with BMHeader.htype */ diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c index 0e9b615afe7..84c177a4d04 100644 --- a/source/blender/bmesh/intern/bmesh_operators.c +++ b/source/blender/bmesh/intern/bmesh_operators.c @@ -272,7 +272,7 @@ BMOpSlot *BMO_slot_get(BMOpSlot slot_args[BMO_OP_MAX_SLOTS], const char *identif int slot_code = bmo_name_to_slotcode_check(slot_args, identifier); if (UNLIKELY(slot_code < 0)) { - //return &BMOpEmptySlot; + // return &BMOpEmptySlot; BLI_assert(0); return NULL; /* better crash */ } diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index 42e8d58567a..172f7050aa0 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -1069,10 +1069,10 @@ void BM_face_triangulate(BMesh *bm, /* named confusingly, l_v1 is in fact the second vertex */ if (split_24) { l_v1 = l_v4; - //l_v2 = l_v2; + // l_v2 = l_v2; } else { - //l_v1 = l_v1; + // l_v1 = l_v1; l_v2 = l_v3; } break; diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index 5790f7fe69c..20042e65287 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -726,9 +726,9 @@ static void *bmw_IslandboundWalker_step(BMWalker *walker) iwalk = BMW_state_add(walker); iwalk->base = owalk.base; - //if (!BMO_face_flag_test(walker->bm, l->f, walker->restrictflag)) + // if (!BMO_face_flag_test(walker->bm, l->f, walker->restrictflag)) // iwalk->curloop = l->radial_next; - iwalk->curloop = l; //else iwalk->curloop = l; + iwalk->curloop = l; // else iwalk->curloop = l; iwalk->lastv = v; return owalk.curloop; diff --git a/source/blender/bmesh/operators/bmo_fill_grid.c b/source/blender/bmesh/operators/bmo_fill_grid.c index c97a5c0f38e..c3d19862ffb 100644 --- a/source/blender/bmesh/operators/bmo_fill_grid.c +++ b/source/blender/bmesh/operators/bmo_fill_grid.c @@ -485,7 +485,7 @@ static void bm_grid_fill(BMesh *bm, const uint xtot = (uint)BM_edgeloop_length_get(estore_a); const uint ytot = (uint)BM_edgeloop_length_get(estore_rail_a); - //BMVert *v; + // BMVert *v; uint i; #ifdef DEBUG uint x, y; diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index efebff5ccb6..616886deba1 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -429,7 +429,7 @@ void bmo_pointmerge_exec(BMesh *bm, BMOperator *op) BMO_slot_vec_get(op->slots_in, "merge_co", vec); - //BMO_op_callf(bm, op->flag, "collapse_uvs edges=%s", op, "edges"); + // BMO_op_callf(bm, op->flag, "collapse_uvs edges=%s", op, "edges"); BMO_op_init(bm, &weldop, op->flag, "weld_verts"); slot_targetmap = BMO_slot_get(weldop.slots_in, "targetmap"); diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index 66021624025..74635be4681 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -40,7 +40,7 @@ typedef struct SubDParams { int smooth_falloff; float fractal; float along_normal; - //int beauty; + // int beauty; bool use_smooth; bool use_smooth_even; bool use_sphere; @@ -391,7 +391,7 @@ static BMVert *bm_subdivide_edge_addvert(BMesh *bm, /* offset for smooth or sphere or fractal */ alter_co(v_new, e_orig, params, factor_subd, v_a, v_b); -#if 0 //BMESH_TODO +#if 0 // BMESH_TODO /* clip if needed by mirror modifier */ if (edge->v1->f2) { if (edge->v1->f2 & edge->v2->f2 & 1) { diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 2ebf89937b0..af5ce4ed9ac 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -1855,7 +1855,7 @@ static void bevel_extend_edge_data(BevVert *bv) v1 = v2; } BMVert *v3 = mesh_vert(vm, (i + 1) % vm->count, 0, 0)->v; - e = v1->e; //Do same as above for first and last vert + e = v1->e; // Do same as above for first and last vert while (e->v1 != v3 && e->v2 != v3) { if (e->v1 == v1) { e = e->v1_disk_link.next; diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index 93461426d7f..da525becc78 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -204,7 +204,7 @@ static bool bm_edge_collapse_is_degenerate_flip(BMEdge *e, const float optimize_ /* use a small value rather then zero so we don't flip a face in multiple steps * (first making it zero area, then flipping again) */ if (dot_v3v3(cross_exist, cross_optim) <= FLT_EPSILON) { - //printf("no flip\n"); + // printf("no flip\n"); return true; } #endif diff --git a/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c b/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c index 13ada1756de..27b4fa15f26 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c +++ b/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c @@ -264,7 +264,7 @@ void BM_mesh_decimate_unsubdivide_ex(BMesh *bm, const int iterations, const bool } else { /* works better to allow these verts to be checked again */ - //BM_elem_index_set(v, VERT_INDEX_IGNORE); /* set_dirty! */ + // BM_elem_index_set(v, VERT_INDEX_IGNORE); /* set_dirty! */ } } } -- cgit v1.2.3