diff options
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_walkers_impl.c | 17 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_connect_pair.c | 11 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_bisect_plane.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_path.c | 1 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_path_uv.c | 1 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_region_match.c | 1 |
6 files changed, 26 insertions, 7 deletions
diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index 7931e953295..15d3a6a6a53 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -94,6 +94,7 @@ static bool bmw_edge_is_wire(const BMWalker *walker, const BMEdge *e) } return BM_edge_is_wire(e); } + /** \} */ /* -------------------------------------------------------------------- */ @@ -107,6 +108,7 @@ static bool bmw_edge_is_wire(const BMWalker *walker, const BMEdge *e) * * \todo Add restriction flag/callback for wire edges. * \{ */ + static void bmw_VertShellWalker_visitEdge(BMWalker *walker, BMEdge *e) { BMwShellWalker *shellWalk = NULL; @@ -236,6 +238,7 @@ static void *bmw_VertShellWalker_step(BMWalker *walker) * * \note this is mainly useful to loop over a shell delimited by edges. * \{ */ + static void bmw_LoopShellWalker_visitLoop(BMWalker *walker, BMLoop *l) { BMwLoopShellWalker *shellWalk = NULL; @@ -509,6 +512,7 @@ static void *bmw_LoopShellWireWalker_step(BMWalker *walker) * Starts at an edge on the mesh and walks over the 'shell' it belongs * to via visiting connected faces. * \{ */ + static void bmw_FaceShellWalker_visitEdge(BMWalker *walker, BMEdge *e) { BMwShellWalker *shellWalk = NULL; @@ -564,6 +568,7 @@ static void *bmw_FaceShellWalker_step(BMWalker *walker) return e; } + /** \} */ /* -------------------------------------------------------------------- */ @@ -573,6 +578,7 @@ static void *bmw_FaceShellWalker_step(BMWalker *walker) * * Walk from a vertex to all connected vertices. * \{ */ + static void bmw_ConnectedVertexWalker_visitVertex(BMWalker *walker, BMVert *v) { BMwConnectedVertexWalker *vwalk; @@ -640,6 +646,7 @@ static void *bmw_ConnectedVertexWalker_step(BMWalker *walker) * * \todo Add restriction flag/callback for wire edges. * \{ */ + static void bmw_IslandboundWalker_begin(BMWalker *walker, void *data) { BMLoop *l = data; @@ -735,6 +742,7 @@ static void *bmw_IslandboundWalker_step(BMWalker *walker) * * \todo Add restriction flag/callback for wire edges. * \{ */ + static void bmw_IslandWalker_begin(BMWalker *walker, void *data) { BMwIslandWalker *iwalk = NULL; @@ -1299,6 +1307,7 @@ static void *bmw_FaceLoopWalker_step(BMWalker *walker) * Conditions for starting and stepping the edge ring have been * tuned to match behavior users expect (dating back to v2.4x). * \{ */ + static void bmw_EdgeringWalker_begin(BMWalker *walker, void *data) { BMwEdgeringWalker *lwalk, owalk, *owalk_pt; @@ -1850,6 +1859,12 @@ static BMWalker bmw_ConnectedVertexWalker_Type = { BM_VERT, /* Valid restrict masks. */ }; +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name All Walker Types + * \{ */ + BMWalker *bm_walker_types[] = { &bmw_VertShellWalker_Type, /* #BMW_VERT_SHELL */ &bmw_LoopShellWalker_Type, /* #BMW_LOOP_SHELL */ @@ -1868,3 +1883,5 @@ BMWalker *bm_walker_types[] = { }; const int bm_totwalkers = ARRAY_SIZE(bm_walker_types); + +/** \} */ diff --git a/source/blender/bmesh/operators/bmo_connect_pair.c b/source/blender/bmesh/operators/bmo_connect_pair.c index 660633e8a0f..29fd8d9094b 100644 --- a/source/blender/bmesh/operators/bmo_connect_pair.c +++ b/source/blender/bmesh/operators/bmo_connect_pair.c @@ -120,19 +120,18 @@ typedef struct PathLinkState { float co_prev[3]; } PathLinkState; -/** - * \name Min Dist Dir Util +/* -------------------------------------------------------------------- */ +/** \name Min Dist Dir Util * * Simply getting the closest intersecting vert/edge is _not_ good enough. see T43792 * we need to get the closest in both directions since the absolute closest may be a dead-end. * * Logic is simple: * - * - first intersection, store the direction. - * - successive intersections will update the first distance if its aligned with the first hit. + * - First intersection, store the direction. + * - Successive intersections will update the first distance if its aligned with the first hit. * otherwise update the opposite distance. - * - caller stores best outcome in both directions. - * + * - Caller stores best outcome in both directions. * \{ */ typedef struct MinDistDir { diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c index c9a5c047462..d220b183b8d 100644 --- a/source/blender/bmesh/tools/bmesh_bisect_plane.c +++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c @@ -88,7 +88,7 @@ static short plane_point_test_v3(const float plane[4], * * Hide flag access * (for more readable code since same flag is used differently for vert/edge-face). - */ + * \{ */ /** Enable when vertex is in the center and its faces have been added to the stack. */ BLI_INLINE void vert_is_center_enable(BMVert *v) diff --git a/source/blender/bmesh/tools/bmesh_path.c b/source/blender/bmesh/tools/bmesh_path.c index ea1e7eb1e43..52bb92a6221 100644 --- a/source/blender/bmesh/tools/bmesh_path.c +++ b/source/blender/bmesh/tools/bmesh_path.c @@ -580,4 +580,5 @@ LinkNode *BM_mesh_calc_path_face(BMesh *bm, return path; } + /** \} */ diff --git a/source/blender/bmesh/tools/bmesh_path_uv.c b/source/blender/bmesh/tools/bmesh_path_uv.c index 30b109d4731..131a8aa0085 100644 --- a/source/blender/bmesh/tools/bmesh_path_uv.c +++ b/source/blender/bmesh/tools/bmesh_path_uv.c @@ -198,6 +198,7 @@ struct LinkNode *BM_mesh_calc_path_uv_vert(BMesh *bm, /* -------------------------------------------------------------------- */ /** \name BM_mesh_calc_path_uv_edge * \{ */ + /* TODO(campbell): not very urgent, since the operator fakes this using vertex path. */ /** \} */ diff --git a/source/blender/bmesh/tools/bmesh_region_match.c b/source/blender/bmesh/tools/bmesh_region_match.c index 8a909cbc9fd..2ada18f51e7 100644 --- a/source/blender/bmesh/tools/bmesh_region_match.c +++ b/source/blender/bmesh/tools/bmesh_region_match.c @@ -1223,6 +1223,7 @@ static BMEdge *bm_face_region_pivot_edge_find(BMFace **faces_region, return e_pivot; } + /** \} */ #endif /* USE_PIVOT_SEARCH */ |