diff options
author | Campbell Barton <campbell@blender.org> | 2022-03-15 09:29:54 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-03-15 09:29:54 +0300 |
commit | a0a572ce8b59d84d4ac632b099adae0e20c3f670 (patch) | |
tree | 12965acc42503169b58f81c92f2e74066a9e0409 /source | |
parent | 683c130b06110949f2c6fcfd92084d61294ff742 (diff) |
Cleanup: correct unbalanced doxy sections
Diffstat (limited to 'source')
13 files changed, 67 insertions, 32 deletions
diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c b/source/blender/blenkernel/intern/subdiv_mesh.c index 953f040fa0d..38239e7ddd6 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.c +++ b/source/blender/blenkernel/intern/subdiv_mesh.c @@ -415,8 +415,6 @@ static void subdiv_mesh_tls_free(void *tls_v) /** \} */ -/** \} */ - /* -------------------------------------------------------------------- */ /** \name Accumulation helpers * \{ */ diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 9297d1082e2..d7bbc0eab2b 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -1650,12 +1650,12 @@ static void MARKER_OT_make_links_scene(wmOperatorType *ot) /** \} */ -#ifdef DURIAN_CAMERA_SWITCH - /* -------------------------------------------------------------------- */ /** \name Camera Bind Marker * \{ */ +#ifdef DURIAN_CAMERA_SWITCH + static int ed_marker_camera_bind_exec(bContext *C, wmOperator *op) { bScreen *screen = CTX_wm_screen(C); @@ -1718,6 +1718,7 @@ static void MARKER_OT_camera_bind(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } + #endif /** \} */ diff --git a/source/blender/editors/interface/interface_dropboxes.cc b/source/blender/editors/interface/interface_dropboxes.cc index fa0c7d5619b..2e8708827e7 100644 --- a/source/blender/editors/interface/interface_dropboxes.cc +++ b/source/blender/editors/interface/interface_dropboxes.cc @@ -73,6 +73,8 @@ static void ui_drop_name_copy(wmDrag *drag, wmDropBox *drop) RNA_string_set(drop->ptr, "string", id->name + 2); } +/** \} */ + /* -------------------------------------------------------------------- */ /** \name Material Drag/Drop Callbacks * \{ */ diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index b25df4bab26..7cef3e1725b 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1491,6 +1491,8 @@ void OBJECT_OT_paths_range_update(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } +/** \} */ + /* -------------------------------------------------------------------- */ /** \name Object Shade Smooth/Flat Operator * \{ */ diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc index 47bf7a28352..63202f3902a 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc @@ -1122,10 +1122,10 @@ static void CURVES_OT_sculptmode_toggle(wmOperatorType *ot) ot->flag = OPTYPE_UNDO | OPTYPE_REGISTER; } -} // namespace blender::ed::sculpt_paint - /** \} */ +} // namespace blender::ed::sculpt_paint + /* -------------------------------------------------------------------- */ /** \name * Registration * \{ */ diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 70ff7596d6d..be105a23a84 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -2738,6 +2738,10 @@ static void update_brush_local_mat(Sculpt *sd, Object *ob) /** \} */ +/* -------------------------------------------------------------------- */ +/** \name Generic Brush Plane & Symmetry Utilities + * \{ */ + typedef struct { SculptSession *ss; const float *ray_start; @@ -5702,9 +5706,3 @@ void SCULPT_fake_neighbors_free(Object *ob) } /** \} */ - -/* -------------------------------------------------------------------- */ -/** \name Operator Registration - * \{ */ - -/** \} */ diff --git a/source/blender/editors/sculpt_paint/sculpt_brush_types.c b/source/blender/editors/sculpt_paint/sculpt_brush_types.c index f75fb8e7542..39544a41a87 100644 --- a/source/blender/editors/sculpt_paint/sculpt_brush_types.c +++ b/source/blender/editors/sculpt_paint/sculpt_brush_types.c @@ -277,6 +277,8 @@ static void sculpt_project_v3_normal_align(SculptSession *ss, grab_delta, ss->cache->sculpt_normal_symm, (len_signed * normal_weight) * len_view_scale); } +/** \} */ + /* -------------------------------------------------------------------- */ /** \name Sculpt Draw Brush * \{ */ @@ -358,6 +360,10 @@ void SCULPT_do_draw_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode) /** \} */ +/* -------------------------------------------------------------------- */ +/** \name Sculpt Fill Brush + * \{ */ + static void do_fill_brush_task_cb_ex(void *__restrict userdata, const int n, const TaskParallelTLS *__restrict tls) @@ -731,6 +737,10 @@ void SCULPT_do_clay_thumb_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int to /** \} */ +/* -------------------------------------------------------------------- */ +/** \name Sculpt Flatten Brush + * \{ */ + static void do_flatten_brush_task_cb_ex(void *__restrict userdata, const int n, const TaskParallelTLS *__restrict tls) @@ -1704,6 +1714,8 @@ void SCULPT_do_nudge_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode BLI_task_parallel_range(0, totnode, &data, do_nudge_brush_task_cb_ex, &settings); } +/** \} */ + /* -------------------------------------------------------------------- */ /** \name Sculpt Crease & Blob Brush * \{ */ @@ -2131,8 +2143,13 @@ void SCULPT_do_elastic_deform_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, in BKE_pbvh_parallel_range_settings(&settings, true, totnode); BLI_task_parallel_range(0, totnode, &data, do_elastic_deform_brush_task_cb_ex, &settings); } + /** \} */ +/* -------------------------------------------------------------------- */ +/** \name Sculpt Draw Sharp Brush + * \{ */ + static void do_draw_sharp_brush_task_cb_ex(void *__restrict userdata, const int n, const TaskParallelTLS *__restrict tls) @@ -2212,6 +2229,8 @@ void SCULPT_do_draw_sharp_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int to BLI_task_parallel_range(0, totnode, &data, do_draw_sharp_brush_task_cb_ex, &settings); } +/** \} */ + /* -------------------------------------------------------------------- */ /** \name Sculpt Topology Brush * \{ */ @@ -2447,6 +2466,7 @@ void SCULPT_do_slide_relax_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int t BLI_task_parallel_range(0, totnode, &data, do_topology_slide_task_cb_ex, &settings); } } + /** \} */ /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/space_node/node_add.cc b/source/blender/editors/space_node/node_add.cc index 3c13ec7d0b4..30bd0fb528b 100644 --- a/source/blender/editors/space_node/node_add.cc +++ b/source/blender/editors/space_node/node_add.cc @@ -43,12 +43,12 @@ #include "node_intern.hh" /* own include */ +namespace blender::ed::space_node { + /* -------------------------------------------------------------------- */ /** \name Utilities * \{ */ -namespace blender::ed::space_node { - bNode *node_add_node(const bContext &C, const char *idname, int type, float locx, float locy) { SpaceNode &snode = *CTX_wm_space_node(&C); diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc index 9a7b44fb909..c757fb46407 100644 --- a/source/blender/editors/space_node/node_relationships.cc +++ b/source/blender/editors/space_node/node_relationships.cc @@ -54,10 +54,6 @@ using namespace blender::nodes::node_tree_ref_types; -/* -------------------------------------------------------------------- */ -/** \name Add Node - * \{ */ - struct bNodeListItem { struct bNodeListItem *next, *prev; struct bNode *node; @@ -83,6 +79,10 @@ static void clear_picking_highlight(ListBase *links) namespace blender::ed::space_node { +/* -------------------------------------------------------------------- */ +/** \name Add Node + * \{ */ + static bNodeLink *create_drag_link(bNode &node, bNodeSocket &sock) { bNodeLink *oplink = MEM_cnew<bNodeLink>(__func__); @@ -427,12 +427,12 @@ static void snode_autoconnect(SpaceNode &snode, const bool allow_multiple, const /** \} */ +namespace viewer_linking { + /* -------------------------------------------------------------------- */ /** \name Link Viewer Operator * \{ */ -namespace viewer_linking { - /* Depending on the node tree type, different socket types are supported by viewer nodes. */ static bool socket_can_be_viewed(const OutputSocketRef &socket) { @@ -698,8 +698,14 @@ static int node_link_viewer(const bContext &C, bNode &bnode_to_view) return link_socket_to_viewer(C, viewer_bnode, bnode_to_view, bsocket_to_view); } +/** \} */ + } // namespace viewer_linking +/* -------------------------------------------------------------------- */ +/** \name Link to Viewer Node Operator + * \{ */ + static int node_active_link_viewer_exec(bContext *C, wmOperator *UNUSED(op)) { SpaceNode &snode = *CTX_wm_space_node(C); @@ -1926,8 +1932,14 @@ static bool ed_node_link_conditions(ScrArea *area, return true; } +/** \} */ + } // namespace blender::ed::space_node +/* -------------------------------------------------------------------- */ +/** \name Node Line Intersection Test + * \{ */ + void ED_node_link_intersect_test(ScrArea *area, int test) { using namespace blender::ed::space_node; @@ -1991,10 +2003,10 @@ void ED_node_link_intersect_test(ScrArea *area, int test) } } -namespace blender::ed::space_node { - /** \} */ +namespace blender::ed::space_node { + /* -------------------------------------------------------------------- */ /** \name Node Insert Offset Operator * \{ */ diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index d3fc3e9d352..36eafedbc80 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -147,11 +147,10 @@ static void format_draw_color(const TextDrawContext *tdc, char formatchar) /* -------------------------------------------------------------------- */ /** \name Draw Text - * \{ */ - -/** - * Notes on word-wrap - * -- + * + * Notes on Word-Wrap + * ================== + * * All word-wrap functions follow the algorithm below to maintain consistency: * - line: * The line to wrap (tabs converted to spaces) @@ -176,7 +175,8 @@ static void format_draw_color(const TextDrawContext *tdc, char formatchar) * pos += 1 * print line[draw_start:] * \encode - */ + * + * \{ */ int wrap_width(const SpaceText *st, ARegion *region) { @@ -1031,6 +1031,7 @@ static void draw_textscroll(const SpaceText *st, rcti *scroll, rcti *back) * \{ */ #if 0 + static void draw_documentation(const SpaceText *st, ARegion *region) { TextDrawContext tdc = {0}; @@ -1138,6 +1139,7 @@ static void draw_documentation(const SpaceText *st, ARegion *region) } } } + #endif /** \} */ diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 86d9867973a..c8dd7ca45aa 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -779,6 +779,8 @@ enum { SEQ_TRANSFORM_FILTER_BILINEAR = 1, }; +/** \} */ + #ifdef __cplusplus } #endif diff --git a/source/blender/modifiers/intern/MOD_weld.cc b/source/blender/modifiers/intern/MOD_weld.cc index a2388195aa4..93d4b56176c 100644 --- a/source/blender/modifiers/intern/MOD_weld.cc +++ b/source/blender/modifiers/intern/MOD_weld.cc @@ -219,5 +219,3 @@ ModifierTypeInfo modifierType_Weld = { /* blendWrite */ nullptr, /* blendRead */ nullptr, }; - -/** \} */ diff --git a/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc b/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc index eb216c08289..8beb6dcb5ce 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc @@ -1095,6 +1095,8 @@ static void node_geo_exec(GeoNodeExecParams params) params.set_output("Geometry", geometry_set); } +/** \} */ + } // namespace blender::nodes::node_geo_duplicate_elements_cc void register_node_type_geo_duplicate_elements() @@ -1115,5 +1117,3 @@ void register_node_type_geo_duplicate_elements() ntype.declare = file_ns::node_declare; nodeRegisterType(&ntype); } - -/** \} */ |