diff --git a/intern/ghost/intern/GHOST_SystemWayland.cc b/intern/ghost/intern/GHOST_SystemWayland.cc index 0ae5191ec3b..f9a48e6b467 100644 --- a/intern/ghost/intern/GHOST_SystemWayland.cc +++ b/intern/ghost/intern/GHOST_SystemWayland.cc @@ -6997,7 +6997,7 @@ static void gwl_registry_wl_seat_remove(GWL_Display *display, void *user_data, c /* Run after tablet & input devices have been disabled * to ensure the buffer from a *visible* cursor never destroyed. * - * Note that most compositors will have already releases the buffer, + * Note that most compositors will have already released the buffer, * in that case this will have been set to null. * However this isn't guaranteed, see: #145557. */ if (seat->cursor.wl.buffer) { diff --git a/source/blender/blenlib/intern/delaunay_2d.cc b/source/blender/blenlib/intern/delaunay_2d.cc index 4f41b76e9e1..bc2ab9d25ca 100644 --- a/source/blender/blenlib/intern/delaunay_2d.cc +++ b/source/blender/blenlib/intern/delaunay_2d.cc @@ -2459,9 +2459,8 @@ template void remove_faces_in_holes(CDT_state *cdt_state) BLI_assert(se != nullptr); se_next = se->next; /* In case we delete this edge. */ if (se->edge && !is_constrained_edge(se->edge)) { - /* Invalidate one half of this edge. The other has will be or has been - * handled with the adjacent triangle is processed: it should be part of the same hole. - */ + /* Invalidate one half of this edge. The other will be, or has already been handled + * with the adjacent triangle is processed: it should be part of the same hole. */ se->next = nullptr; } se = se_next; diff --git a/source/blender/blenlib/intern/mesh_boolean.cc b/source/blender/blenlib/intern/mesh_boolean.cc index 2e9173af919..f9da07e9b75 100644 --- a/source/blender/blenlib/intern/mesh_boolean.cc +++ b/source/blender/blenlib/intern/mesh_boolean.cc @@ -3145,11 +3145,11 @@ static bool dissolve_leaves_valid_bmesh(FaceMergeState *fms, } /** - * mf_left and mf_right should share a #MergeEdge me, having index me_index. - * We change mf_left to remove edge me and insert the appropriate edges of - * mf_right in between the start and end vertices of that edge. - * We change the left face of the spliced-in edges to be mf_left's index. - * We mark the merge_to property of mf_right, which is now in essence deleted. + * `mf_left` and `mf_right` should share a #MergeEdge `me`, having index `me_index`. + * We change `mf_left` to remove edge `me` and insert the appropriate edges of + * `mf_right` in between the start and end vertices of that edge. + * We change the left face of the spliced-in edges to be `mf_left`'s index. + * We mark the `merge_to` property of `mf_right`, which is now in essence deleted. */ static void splice_faces( FaceMergeState *fms, MergeEdge &me, int me_index, MergeFace &mf_left, MergeFace &mf_right) diff --git a/source/blender/editors/transform/transform_convert_mesh.cc b/source/blender/editors/transform/transform_convert_mesh.cc index 36722708910..932c41c9b15 100644 --- a/source/blender/editors/transform/transform_convert_mesh.cc +++ b/source/blender/editors/transform/transform_convert_mesh.cc @@ -576,12 +576,11 @@ static void mesh_customdatacorrect_apply_vert(TransCustomDataLayer *tcld, bool co_prev_ok; bool co_next_ok; - /* In the unlikely case that we're next to a zero length edge - - * walk around the to the next. + /* In the unlikely case that we're next to a zero length edge - walk around to the next. * * Since we only need to check if the vertex is in this corner, * its not important _which_ loop - as long as its not overlapping - * 'sv->co_orig_3d', see: #45096. */ + * `sv->co_orig_3d`, see: #45096. */ project_plane_normalized_v3_v3v3(v_proj[0], co_prev, v_proj_axis); while (UNLIKELY(((co_prev_ok = (len_squared_v3v3(v_proj[1], v_proj[0]) > eps)) == false) && ((l_prev = l_prev->prev) != l->next))) diff --git a/source/blender/gpu/tests/shader_test.cc b/source/blender/gpu/tests/shader_test.cc index 6c5fe5acf4b..6f16d76b644 100644 --- a/source/blender/gpu/tests/shader_test.cc +++ b/source/blender/gpu/tests/shader_test.cc @@ -324,7 +324,7 @@ static std::string print_test_data(const TestOutputRawData &raw, TestType type) static StringRef print_test_line(StringRefNull test_src, int64_t test_line) { /* Start at line one like the line report scheme. - * However, the our preprocessor adds a line directive at the top of the file. Skip it. */ + * However, our preprocessor adds a line directive at the top of the file. Skip it. */ int64_t line = 1 - 1; int64_t last_pos = 0; int64_t pos = 0; diff --git a/source/blender/python/intern/bpy_rna.hh b/source/blender/python/intern/bpy_rna.hh index 522913a080e..8531cce6efe 100644 --- a/source/blender/python/intern/bpy_rna.hh +++ b/source/blender/python/intern/bpy_rna.hh @@ -192,7 +192,7 @@ struct BPy_FunctionRNA { FunctionRNA *func; /** * Instance call only. This is *always* set to `pyrna_func_vectorcall`. - * Storing this value is a required by the Python C-API (PEP 590). + * Storing this value is required by the Python C-API (PEP 590). */ vectorcallfunc vectorcall; }; diff --git a/source/blender/python/intern/bpy_rna_context.cc b/source/blender/python/intern/bpy_rna_context.cc index 6bec39b991e..c802f35eeef 100644 --- a/source/blender/python/intern/bpy_rna_context.cc +++ b/source/blender/python/intern/bpy_rna_context.cc @@ -382,7 +382,7 @@ static PyObject *bpy_rna_context_temp_override_exit(BPyContextTempOverride *self wmWindow *win = self->ctx_temp.win_is_set ? self->ctx_temp.win : self->ctx_init.win; if (win && wm_check_window_exists(bmain, win)) { /* Disallow switching away from temporary-screens & full-screen areas, while it could be - * useful to support this closing a these screens uses different and more involved logic + * useful to support this, closing screens uses different and more involved logic * compared with switching between user managed screens, see: #117188. */ if (wm_check_screen_switch_supported(WM_window_get_active_screen(win))) { bpy_rna_context_temp_set_screen_for_window(C, win, self->ctx_temp_orig.screen);