From 499fec6f79a26c9c9d2d61b90bda2e4cec424f81 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 6 Jan 2022 13:54:52 +1100 Subject: Cleanup: spelling in comments --- source/blender/editors/gpencil/annotate_paint.c | 4 ++-- source/blender/editors/gpencil/gpencil_paint.c | 6 ++--- .../blender/editors/gpencil/gpencil_sculpt_paint.c | 4 ++-- .../blender/editors/gpencil/gpencil_vertex_paint.c | 12 +++++----- .../blender/editors/gpencil/gpencil_weight_paint.c | 4 ++-- source/blender/editors/include/ED_gpencil.h | 2 +- source/blender/editors/include/ED_mesh.h | 6 ++--- source/blender/editors/include/ED_transform.h | 2 +- .../blender/editors/interface/interface_handlers.c | 2 +- source/blender/editors/interface/interface_style.c | 4 ++-- source/blender/editors/io/io_obj.c | 2 +- source/blender/editors/mesh/editmesh_path.c | 2 +- source/blender/editors/physics/dynamicpaint_ops.c | 2 +- source/blender/editors/render/render_internal.cc | 8 +++---- source/blender/editors/render/render_opengl.cc | 4 ++-- source/blender/editors/render/render_preview.cc | 10 ++++---- source/blender/editors/screen/area.c | 2 +- .../editors/sculpt_paint/paint_image_proj.c | 2 +- source/blender/editors/space_api/spacetypes.c | 2 +- source/blender/editors/space_clip/clip_editor.c | 2 +- source/blender/editors/space_image/space_image.c | 2 +- source/blender/editors/space_node/node_group.cc | 27 ++++++++++------------ .../blender/editors/space_view3d/view3d_select.c | 7 +++++- .../transform/transform_convert_sequencer.c | 4 ++-- source/blender/editors/transform/transform_data.h | 4 ++-- 25 files changed, 64 insertions(+), 62 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c index 196cd1028ea..25f03058597 100644 --- a/source/blender/editors/gpencil/annotate_paint.c +++ b/source/blender/editors/gpencil/annotate_paint.c @@ -1132,7 +1132,7 @@ static void annotation_stroke_eraser_dostroke(tGPsdata *p, if (!(p->flags & GP_PAINTFLAG_SELECTMASK) || (gps->points->flag & GP_SPOINT_SELECT)) { gpencil_point_to_xy(&p->gsc, gps, gps->points, &pc1[0], &pc1[1]); - /* do boundbox check first */ + /* Do bound-box check first. */ if ((!ELEM(V2D_IS_CLIPPED, pc1[0], pc1[1])) && BLI_rcti_isect_pt(rect, pc1[0], pc1[1])) { /* only check if point is inside */ if (len_v2v2_int(mval_i, pc1) <= radius) { @@ -1174,7 +1174,7 @@ static void annotation_stroke_eraser_dostroke(tGPsdata *p, gpencil_point_to_xy(&p->gsc, gps, pt1, &pc1[0], &pc1[1]); gpencil_point_to_xy(&p->gsc, gps, pt2, &pc2[0], &pc2[1]); - /* Check that point segment of the boundbox of the eraser stroke */ + /* Check that point segment of the bound-box of the eraser stroke. */ if (((!ELEM(V2D_IS_CLIPPED, pc1[0], pc1[1])) && BLI_rcti_isect_pt(rect, pc1[0], pc1[1])) || ((!ELEM(V2D_IS_CLIPPED, pc2[0], pc2[1])) && BLI_rcti_isect_pt(rect, pc2[0], pc2[1]))) { /* Check if point segment of stroke had anything to do with diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index b52d4a410ec..73a94f066e3 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1486,7 +1486,7 @@ static void gpencil_stroke_eraser_dostroke(tGPsdata *p, bGPDspoint pt_temp; gpencil_point_to_parent_space(gps->points, p->diff_mat, &pt_temp); gpencil_point_to_xy(&p->gsc, gps, &pt_temp, &pc1[0], &pc1[1]); - /* do boundbox check first */ + /* Do bound-box check first. */ if ((!ELEM(V2D_IS_CLIPPED, pc1[0], pc1[1])) && BLI_rcti_isect_pt(rect, pc1[0], pc1[1])) { /* only check if point is inside */ if (len_v2v2_int(mval_i, pc1) <= radius) { @@ -1511,7 +1511,7 @@ static void gpencil_stroke_eraser_dostroke(tGPsdata *p, gpencil_point_to_parent_space(pt1, p->diff_mat, &npt); gpencil_point_to_xy(&p->gsc, gps, &npt, &pc1[0], &pc1[1]); - /* do boundbox check first */ + /* Do bound-box check first. */ if ((!ELEM(V2D_IS_CLIPPED, pc1[0], pc1[1])) && BLI_rcti_isect_pt(rect, pc1[0], pc1[1])) { /* only check if point is inside */ if (len_v2v2_int(mval_i, pc1) <= radius) { @@ -1581,7 +1581,7 @@ static void gpencil_stroke_eraser_dostroke(tGPsdata *p, copy_v2_v2_int(pc0, pc1); } - /* Check that point segment of the boundbox of the eraser stroke */ + /* Check that point segment of the bound-box of the eraser stroke. */ if (((!ELEM(V2D_IS_CLIPPED, pc0[0], pc0[1])) && BLI_rcti_isect_pt(rect, pc0[0], pc0[1])) || ((!ELEM(V2D_IS_CLIPPED, pc1[0], pc1[1])) && BLI_rcti_isect_pt(rect, pc1[0], pc1[1])) || ((!ELEM(V2D_IS_CLIPPED, pc2[0], pc2[1])) && BLI_rcti_isect_pt(rect, pc2[0], pc2[1]))) { diff --git a/source/blender/editors/gpencil/gpencil_sculpt_paint.c b/source/blender/editors/gpencil/gpencil_sculpt_paint.c index 186c45c9f39..50c7202599a 100644 --- a/source/blender/editors/gpencil/gpencil_sculpt_paint.c +++ b/source/blender/editors/gpencil/gpencil_sculpt_paint.c @@ -1454,7 +1454,7 @@ static bool gpencil_sculpt_brush_do_stroke(tGP_BrushEditData *gso, gpencil_point_to_xy(gsc, gps, &pt_temp, &pc1[0], &pc1[1]); pt_active = (pt->runtime.pt_orig) ? pt->runtime.pt_orig : pt; - /* do boundbox check first */ + /* Do bound-box check first. */ if ((!ELEM(V2D_IS_CLIPPED, pc1[0], pc1[1])) && BLI_rcti_isect_pt(rect, pc1[0], pc1[1])) { /* only check if point is inside */ int mval_i[2]; @@ -1492,7 +1492,7 @@ static bool gpencil_sculpt_brush_do_stroke(tGP_BrushEditData *gso, gpencil_point_to_parent_space(pt2, diff_mat, &npt); gpencil_point_to_xy(gsc, gps, &npt, &pc2[0], &pc2[1]); - /* Check that point segment of the boundbox of the selection stroke */ + /* Check that point segment of the bound-box of the selection stroke. */ if (((!ELEM(V2D_IS_CLIPPED, pc1[0], pc1[1])) && BLI_rcti_isect_pt(rect, pc1[0], pc1[1])) || ((!ELEM(V2D_IS_CLIPPED, pc2[0], pc2[1])) && BLI_rcti_isect_pt(rect, pc2[0], pc2[1]))) { /* Check if point segment of stroke had anything to do with diff --git a/source/blender/editors/gpencil/gpencil_vertex_paint.c b/source/blender/editors/gpencil/gpencil_vertex_paint.c index 633e371cbd1..05304f9914f 100644 --- a/source/blender/editors/gpencil/gpencil_vertex_paint.c +++ b/source/blender/editors/gpencil/gpencil_vertex_paint.c @@ -441,12 +441,12 @@ static bool brush_tint_apply(tGP_BrushVertexpaintData *gso, CLAMP_MIN(pt->vert_color[3], 0.0f); } else { - /* Premult. */ + /* Pre-multiply. */ mul_v3_fl(pt->vert_color, pt->vert_color[3]); /* "Alpha over" blending. */ interp_v3_v3v3(pt->vert_color, pt->vert_color, gso->linear_color, inf); pt->vert_color[3] = pt->vert_color[3] * (1.0 - inf) + inf; - /* Un-premult. */ + /* Un pre-multiply. */ if (pt->vert_color[3] > 0.0f) { mul_v3_fl(pt->vert_color, 1.0f / pt->vert_color[3]); } @@ -460,12 +460,12 @@ static bool brush_tint_apply(tGP_BrushVertexpaintData *gso, CLAMP_MIN(gps->vert_color_fill[3], 0.0f); } else { - /* Premult. */ + /* Pre-multiply. */ mul_v3_fl(gps->vert_color_fill, gps->vert_color_fill[3]); /* "Alpha over" blending. */ interp_v3_v3v3(gps->vert_color_fill, gps->vert_color_fill, gso->linear_color, inf_fill); gps->vert_color_fill[3] = gps->vert_color_fill[3] * (1.0 - inf_fill) + inf_fill; - /* Un-premult. */ + /* Un pre-multiply. */ if (gps->vert_color_fill[3] > 0.0f) { mul_v3_fl(gps->vert_color_fill, 1.0f / gps->vert_color_fill[3]); } @@ -865,7 +865,7 @@ static bool gpencil_vertexpaint_select_stroke(tGP_BrushVertexpaintData *gso, gpencil_point_to_xy(gsc, gps, &pt_temp, &pc1[0], &pc1[1]); pt_active = (pt->runtime.pt_orig) ? pt->runtime.pt_orig : pt; - /* do boundbox check first */ + /* Do bound-box check first. */ if ((!ELEM(V2D_IS_CLIPPED, pc1[0], pc1[1])) && BLI_rcti_isect_pt(rect, pc1[0], pc1[1])) { /* only check if point is inside */ int mval_i[2]; @@ -905,7 +905,7 @@ static bool gpencil_vertexpaint_select_stroke(tGP_BrushVertexpaintData *gso, gpencil_point_to_parent_space(pt2, diff_mat, &npt); gpencil_point_to_xy(gsc, gps, &npt, &pc2[0], &pc2[1]); - /* Check that point segment of the boundbox of the selection stroke */ + /* Check that point segment of the bound-box of the selection stroke. */ if (((!ELEM(V2D_IS_CLIPPED, pc1[0], pc1[1])) && BLI_rcti_isect_pt(rect, pc1[0], pc1[1])) || ((!ELEM(V2D_IS_CLIPPED, pc2[0], pc2[1])) && BLI_rcti_isect_pt(rect, pc2[0], pc2[1]))) { /* Check if point segment of stroke had anything to do with diff --git a/source/blender/editors/gpencil/gpencil_weight_paint.c b/source/blender/editors/gpencil/gpencil_weight_paint.c index b3249294119..15f99d83f6d 100644 --- a/source/blender/editors/gpencil/gpencil_weight_paint.c +++ b/source/blender/editors/gpencil/gpencil_weight_paint.c @@ -432,7 +432,7 @@ static void gpencil_weightpaint_select_stroke(tGP_BrushWeightpaintData *gso, gpencil_point_to_xy(gsc, gps, &pt_temp, &pc1[0], &pc1[1]); pt_active = (pt->runtime.pt_orig) ? pt->runtime.pt_orig : pt; - /* do boundbox check first */ + /* Do bound-box check first. */ if ((!ELEM(V2D_IS_CLIPPED, pc1[0], pc1[1])) && BLI_rcti_isect_pt(rect, pc1[0], pc1[1])) { /* only check if point is inside */ int mval_i[2]; @@ -461,7 +461,7 @@ static void gpencil_weightpaint_select_stroke(tGP_BrushWeightpaintData *gso, gpencil_point_to_parent_space(pt2, diff_mat, &npt); gpencil_point_to_xy(gsc, gps, &npt, &pc2[0], &pc2[1]); - /* Check that point segment of the boundbox of the selection stroke */ + /* Check that point segment of the bound-box of the selection stroke */ if (((!ELEM(V2D_IS_CLIPPED, pc1[0], pc1[1])) && BLI_rcti_isect_pt(rect, pc1[0], pc1[1])) || ((!ELEM(V2D_IS_CLIPPED, pc2[0], pc2[1])) && BLI_rcti_isect_pt(rect, pc2[0], pc2[1]))) { /* Check if point segment of stroke had anything to do with diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h index 5e50a17e80a..49ca5a4c5a3 100644 --- a/source/blender/editors/include/ED_gpencil.h +++ b/source/blender/editors/include/ED_gpencil.h @@ -513,7 +513,7 @@ void ED_gpencil_vgroup_remove(struct bContext *C, struct Object *ob); */ void ED_gpencil_vgroup_select(struct bContext *C, struct Object *ob); /** - * Unselect points of vertex group. + * Un-select points of vertex group. */ void ED_gpencil_vgroup_deselect(struct bContext *C, struct Object *ob); diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index 35838f4ce48..3d8bdd09711 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -60,13 +60,13 @@ struct wmOperator; /* editmesh_utils.c */ /** - * \param em: Editmesh. + * \param em: Edit-mesh used for generating mirror data. * \param use_self: Allow a vertex to point to its self (middle verts). * \param use_select: Restrict to selected verts. * \param respecthide: Skip hidden vertices. * \param use_topology: Use topology mirror. * \param maxdist: Distance for close point test. - * \param r_index: Optional array to write into, as an alternative to a customdata layer + * \param r_index: Optional array to write into, as an alternative to a custom-data layer * (length of total verts). */ void EDBM_verts_mirror_cache_begin_ex(struct BMEditMesh *em, @@ -672,7 +672,7 @@ int *mesh_get_x_mirror_faces(struct Object *ob, struct BMEditMesh *em, struct Me /** * Wrapper for object-mode/edit-mode. * - * call #BM_mesh_elem_table_ensure first for editmesh. + * call #BM_mesh_elem_table_ensure first for edit-mesh. */ int ED_mesh_mirror_get_vert(struct Object *ob, int index); diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index f0d6072fdbc..4f9bdfadbdf 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -188,7 +188,7 @@ void ED_widgetgroup_gizmo2d_rotate_callbacks_set(struct wmGizmoGroupType *gzgt); struct TransformBounds { float center[3]; /* Center for transform widget. */ - float min[3], max[3]; /* Boundbox of selection for transform widget. */ + float min[3], max[3]; /* Bounding-box of selection for transform widget. */ /* Normalized axis */ float axis[3][3]; diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 659ac0ae899..7521ccf4e4c 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -7927,7 +7927,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, const wmEvent * const bool do_copy = event->type == EVT_CKEY && is_press_ctrl_but_no_shift; const bool do_paste = event->type == EVT_VKEY && is_press_ctrl_but_no_shift; - /* Specific handling for listrows, we try to find their overlapping tex button. */ + /* Specific handling for list-rows, we try to find their overlapping text button. */ if ((do_copy || do_paste) && but->type == UI_BTYPE_LISTROW) { uiBut *labelbut = ui_but_list_row_text_activate(C, but, data, event, BUTTON_ACTIVATE_OVER); if (labelbut) { diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c index 643fa128d08..76063412758 100644 --- a/source/blender/editors/interface/interface_style.c +++ b/source/blender/editors/interface/interface_style.c @@ -173,11 +173,11 @@ void UI_fontstyle_draw_ex(const uiFontStyle *fs, BLF_enable(fs->uifont_id, font_flag); if (fs_params->word_wrap == 1) { - /* draw from boundbox top */ + /* Draw from bound-box top. */ yofs = BLI_rcti_size_y(rect) - BLF_height_max(fs->uifont_id); } else { - /* draw from boundbox center */ + /* Draw from bound-box center. */ const float height = BLF_ascender(fs->uifont_id) + BLF_descender(fs->uifont_id); yofs = ceil(0.5f * (BLI_rcti_size_y(rect) - height)); } diff --git a/source/blender/editors/io/io_obj.c b/source/blender/editors/io/io_obj.c index 1e1e3c2ff42..746aabf87cf 100644 --- a/source/blender/editors/io/io_obj.c +++ b/source/blender/editors/io/io_obj.c @@ -234,7 +234,7 @@ static bool wm_obj_export_check(bContext *C, wmOperator *op) /* Both forward and up axes cannot be the same (or same except opposite sign). */ if (RNA_enum_get(op->ptr, "forward_axis") % TOTAL_AXES == (RNA_enum_get(op->ptr, "up_axis") % TOTAL_AXES)) { - /* TODO (ankitm) Show a warning here. */ + /* TODO(@ankitm): Show a warning here. */ RNA_enum_set(op->ptr, "up_axis", RNA_enum_get(op->ptr, "up_axis") % TOTAL_AXES + 1); changed = true; } diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c index 30a453a32ee..e48b5d8255e 100644 --- a/source/blender/editors/mesh/editmesh_path.c +++ b/source/blender/editors/mesh/editmesh_path.c @@ -377,7 +377,7 @@ static void edgetag_ensure_cd_flag(Mesh *me, const char edge_mode) } } -/* mesh shortest path select, uses prev-selected edge */ +/* Mesh shortest path select, uses previously-selected edge. */ /* since you want to create paths with multiple selects, it doesn't have extend option */ static void mouse_mesh_shortest_path_edge(Scene *scene, diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c index 80e3f934c80..3214180309b 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.c +++ b/source/blender/editors/physics/dynamicpaint_ops.c @@ -373,7 +373,7 @@ static void dynamicPaint_bakeImageSequence(DynamicPaintBakeJob *job) /* Show progress bar. */ *(job->do_update) = true; - /* Set frame to start point (also inits modifier data) */ + /* Set frame to start point (also initializes modifier data). */ frame = surface->start_frame; orig_frame = input_scene->r.cfra; input_scene->r.cfra = (int)frame; diff --git a/source/blender/editors/render/render_internal.cc b/source/blender/editors/render/render_internal.cc index 441be3a6ce3..1d0de322271 100644 --- a/source/blender/editors/render/render_internal.cc +++ b/source/blender/editors/render/render_internal.cc @@ -124,13 +124,13 @@ static bool image_buffer_calc_tile_rect(const RenderResult *rr, /* When `renrect` argument is not nullptr, we only refresh scan-lines. */ if (renrect) { - /* if (tile_height == recty), rendering of layer is ready, + /* `if (tile_height == recty)`, rendering of layer is ready, * we should not draw, other things happen... */ if (rr->renlay == nullptr || renrect->ymax >= rr->recty) { return false; } - /* tile_x here is first subrect x coord, tile_width defines subrect width */ + /* `tile_x` here is first sub-rectangle x coord, tile_width defines sub-rectangle width. */ tile_x = renrect->xmin; tile_width = renrect->xmax - tile_x; if (tile_width < 2) { @@ -705,9 +705,9 @@ static void render_endjob(void *rjv) { RenderJob *rj = static_cast(rjv); - /* this render may be used again by the sequencer without the active + /* This render may be used again by the sequencer without the active * 'Render' where the callbacks would be re-assigned. assign dummy callbacks - * to avoid referencing freed renderjobs bug T24508. */ + * to avoid referencing freed render-jobs bug T24508. */ RE_InitRenderCB(rj->re); if (rj->main != G_MAIN) { diff --git a/source/blender/editors/render/render_opengl.cc b/source/blender/editors/render/render_opengl.cc index 263c51f3488..88aed0ae174 100644 --- a/source/blender/editors/render/render_opengl.cc +++ b/source/blender/editors/render/render_opengl.cc @@ -92,7 +92,7 @@ #endif /* TODO(sergey): Find better approximation of the scheduled frames. - * For really highres renders it might fail still. */ + * For really high-resolution renders it might fail still. */ #define MAX_SCHEDULED_FRAMES 8 struct OGLRender { @@ -141,7 +141,7 @@ struct OGLRender { wmWindowManager *wm; wmWindow *win; - /** Use to check if running modal or not (invoke'd or exec'd). */ + /** Use to check if running modal or not (invoked or executed). */ wmTimer *timer; void **movie_ctx_arr; diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc index dc773504807..16e83395401 100644 --- a/source/blender/editors/render/render_preview.cc +++ b/source/blender/editors/render/render_preview.cc @@ -410,8 +410,8 @@ static const char *preview_world_name(const Scene *sce, * material trick to show the floor in the reflections, but hide the floor for camera rays. For * Eevee we use a transparent world that has a projected grid. * - * In the future when Eevee supports vulkan raytracing we can re-evaluate and perhaps remove this - * approximation. + * In the future when Eevee supports VULKAN ray-tracing we can re-evaluate and perhaps remove + * this approximation. */ if (id_type == ID_MA && pr_method == PR_ICON_RENDER && !render_engine_supports_ray_visibility(sce)) { @@ -1424,9 +1424,9 @@ static void icon_preview_startjob(void *customdata, short *stop, short *do_updat iuser.framenr = 1; iuser.scene = sp->scene; - /* elubie: this needs to be changed: here image is always loaded if not + /* NOTE(@elubie): this needs to be changed: here image is always loaded if not * already there. Very expensive for large images. Need to find a way to - * only get existing ibuf */ + * only get existing `ibuf`. */ ibuf = BKE_image_acquire_ibuf(ima, &iuser, nullptr); if (ibuf == nullptr || (ibuf->rect == nullptr && ibuf->rect_float == nullptr)) { BKE_image_release_ibuf(ima, ibuf, nullptr); @@ -1507,7 +1507,7 @@ static void other_id_types_preview_render(IconPreview *ip, /* These types don't use the ShaderPreview mess, they have their own types and functions. */ BLI_assert(!ip->id || !ELEM(GS(ip->id->name), ID_OB)); - /* construct shader preview from image size and previewcustomdata */ + /* Construct shader preview from image size and preview custom-data. */ sp->scene = ip->scene; sp->owner = ip->owner; sp->sizex = cur_size->sizex; diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 95711fe20fa..c6834c84794 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1680,7 +1680,7 @@ static void ed_default_handlers( /* NOTE: add-handler checks if it already exists. */ - /* XXX it would be good to have boundbox checks for some of these... */ + /* XXX: it would be good to have bound-box checks for some of these. */ if (flag & ED_KEYMAP_UI) { wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "User Interface", 0, 0); WM_event_add_keymap_handler(handlers, keymap); diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 8a5d75d5f77..27d19532785 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -6567,7 +6567,7 @@ static bool proj_paint_add_slot(bContext *C, wmOperator *op) nodeSetActive(ntree, imanode); - /* Connect to first available principled bsdf node. */ + /* Connect to first available principled BSDF node. */ bNode *in_node = ntreeFindType(ntree, SH_NODE_BSDF_PRINCIPLED); bNode *out_node = imanode; diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index 035bc7e297d..93d023c8bb4 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -72,7 +72,7 @@ void ED_spacetypes_init(void) { - /* UI unit is a variable, may be used in some space type inits. */ + /* UI unit is a variable, may be used in some space type initialization. */ U.widget_unit = 20; /* Create space types. */ diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c index 5a999b1fad7..09daed7e2e7 100644 --- a/source/blender/editors/space_clip/clip_editor.c +++ b/source/blender/editors/space_clip/clip_editor.c @@ -646,7 +646,7 @@ void ED_space_clip_set_mask(bContext *C, SpaceClip *sc, Mask *mask) * \{ */ typedef struct PrefetchJob { - /* Clip into which cache the frames will be prefetched into. */ + /** Clip into which cache the frames will be pre-fetched into. */ MovieClip *clip; /* Local copy of the clip which is used to decouple reading in a way which does not require diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index dad494e6984..52cb36b1b8f 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -297,7 +297,7 @@ static void image_refresh(const bContext *C, ScrArea *area) ima = ED_space_image(sima); BKE_image_user_frame_calc(ima, &sima->iuser, scene->r.cfra); - /* check if we have to set the image from the editmesh */ + /* Check if we have to set the image from the edit-mesh. */ if (ima && (ima->source == IMA_SRC_VIEWER && sima->mode == SI_MODE_MASK)) { if (scene->nodetree) { Mask *mask = ED_space_image_get_mask(sima); diff --git a/source/blender/editors/space_node/node_group.cc b/source/blender/editors/space_node/node_group.cc index f6802e64049..4834ca3174a 100644 --- a/source/blender/editors/space_node/node_group.cc +++ b/source/blender/editors/space_node/node_group.cc @@ -229,14 +229,14 @@ static bool node_group_ungroup(Main *bmain, bNodeTree *ntree, bNode *gnode) Vector nodes_delayed_free; const bNodeTree *ngroup = reinterpret_cast(gnode->id); - /* wgroup is a temporary copy of the NodeTree we're merging in - * - all of wgroup's nodes are copied across to their new home - * - ngroup (i.e. the source NodeTree) is left unscathed - * - temp copy. do change ID usercount for the copies + /* `wgroup` is a temporary copy of the #NodeTree we're merging in + * - All of wgroup's nodes are copied across to their new home. + * - `ngroup` (i.e. the source NodeTree) is left unscathed. + * - Temp copy. do change ID user-count for the copies. */ bNodeTree *wgroup = ntreeCopyTree(bmain, ngroup); - /* Add the nodes into the ntree */ + /* Add the nodes into the `ntree`. */ LISTBASE_FOREACH_MUTABLE (bNode *, node, &wgroup->nodes) { /* Remove interface nodes. * This also removes remaining links to and from interface nodes. @@ -246,9 +246,8 @@ static bool node_group_ungroup(Main *bmain, bNodeTree *ntree, bNode *gnode) nodes_delayed_free.append(node); } - /* keep track of this node's RNA "base" path (the part of the path identifying the node) - * if the old nodetree has animation data which potentially covers this node - */ + /* Keep track of this node's RNA "base" path (the part of the path identifying the node) + * if the old node-tree has animation data which potentially covers this node. */ const char *old_animation_basepath = nullptr; if (wgroup->adt) { PointerRNA ptr; @@ -483,9 +482,8 @@ static bool node_group_separate_selected( newnode = node; } - /* keep track of this node's RNA "base" path (the part of the path identifying the node) - * if the old nodetree has animation data which potentially covers this node - */ + /* Keep track of this node's RNA "base" path (the part of the path identifying the node) + * if the old node-tree has animation data which potentially covers this node. */ if (ngroup.adt) { PointerRNA ptr; char *path; @@ -783,9 +781,8 @@ static void node_group_make_insert_selected(const bContext &C, bNodeTree &ntree, /* move nodes over */ LISTBASE_FOREACH_MUTABLE (bNode *, node, &ntree.nodes) { if (node_group_make_use_node(*node, gnode)) { - /* keep track of this node's RNA "base" path (the part of the pat identifying the node) - * if the old nodetree has animation data which potentially covers this node - */ + /* Keep track of this node's RNA "base" path (the part of the pat identifying the node) + * if the old node-tree has animation data which potentially covers this node. */ if (ntree.adt) { PointerRNA ptr; char *path; @@ -995,7 +992,7 @@ static bNode *node_group_make_from_selected(const bContext &C, return nullptr; } - /* new nodetree */ + /* New node-tree. */ bNodeTree *ngroup = ntreeAddTree(bmain, "NodeGroup", ntreetype); /* make group node */ diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index cc8aac21a6e..45899880b41 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -4040,7 +4040,9 @@ static bool lattice_circle_select(ViewContext *vc, return data.is_changed; } -/* NOTE: pose-bone case is copied from editbone case... */ +/** + * \note logic is shared with the edit-bone case, see #armature_circle_doSelectJoint. + */ static bool pchan_circle_doSelectJoint(void *userData, bPoseChannel *pchan, const float screen_co[2]) @@ -4137,6 +4139,9 @@ static bool pose_circle_select(ViewContext *vc, return data.is_changed; } +/** + * \note logic is shared with the pose-bone case, see #pchan_circle_doSelectJoint. + */ static bool armature_circle_doSelectJoint(void *userData, EditBone *ebone, const float screen_co[2], diff --git a/source/blender/editors/transform/transform_convert_sequencer.c b/source/blender/editors/transform/transform_convert_sequencer.c index 88c01321785..2244f82509f 100644 --- a/source/blender/editors/transform/transform_convert_sequencer.c +++ b/source/blender/editors/transform/transform_convert_sequencer.c @@ -302,7 +302,7 @@ static SeqCollection *extract_standalone_strips(SeqCollection *transformed_strip return collection; } -/* Query strips positioned after left edge of transformed strips boundbox. */ +/* Query strips positioned after left edge of transformed strips bound-box. */ static SeqCollection *query_right_side_strips(ListBase *seqbase, SeqCollection *transformed_strips) { int minframe = MAXFRAME; @@ -351,7 +351,7 @@ static ListBase *seqbase_active_get(const TransInfo *t) return SEQ_active_seqbase_get(ed); } -/* Offset all strips positioned after left edge of transformed strips boundbox by amount equal +/* Offset all strips positioned after left edge of transformed strips bound-box by amount equal * to overlap of transformed strips. */ static void seq_transform_handle_expand_to_fit(TransInfo *t, SeqCollection *transformed_strips) { diff --git a/source/blender/editors/transform/transform_data.h b/source/blender/editors/transform/transform_data.h index 6cfceedb389..a78c2491a1a 100644 --- a/source/blender/editors/transform/transform_data.h +++ b/source/blender/editors/transform/transform_data.h @@ -27,8 +27,8 @@ struct Object; struct bConstraint; #define TRANSDATABASIC \ - /** Extra data (mirrored element pointer, in editmode mesh to BMVert) \ - * (editbone for roll fixing) (...). */ \ + /** Extra data (mirrored element pointer, in edit-mode mesh to #BMVert) \ + * (edit-bone for roll fixing) (...). */ \ void *extra; \ /** Location of the data to transform. */ \ float *loc; \ -- cgit v1.2.3