From 2c27d2be540a8eae07e7a0c9fc19acd164de4a5a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 1 Aug 2025 11:35:51 +0000 Subject: [PATCH] Cleanup: grammar corrections, minor improvements to wording --- intern/cycles/device/metal/queue.mm | 2 +- intern/cycles/kernel/integrator/path_state.h | 2 +- intern/cycles/kernel/sample/sobol_burley.h | 4 ++-- intern/cycles/kernel/svm/image.h | 2 +- intern/cycles/scene/pass.h | 4 ++-- intern/ghost/GHOST_C-api.h | 2 +- intern/ghost/intern/GHOST_SystemWayland.cc | 4 ++-- intern/ghost/intern/GHOST_SystemWin32.cc | 6 +++--- intern/ghost/intern/GHOST_WindowCocoa.mm | 2 +- .../addons_core/bl_pkg/bl_extension_ops.py | 4 ++-- scripts/addons_core/bl_pkg/cli/blender_ext.py | 2 +- .../extensions/stale_file_manager.py | 2 +- scripts/modules/bpy/path.py | 2 +- scripts/startup/bl_ui/space_properties.py | 2 +- scripts/startup/bl_ui/space_userpref.py | 2 +- .../intern/asset_library_service.hh | 8 ++++---- .../tests/asset_library_service_test.cc | 14 +++++++++----- .../blenfont/intern/blf_internal_types.hh | 4 ++-- .../blenkernel/BKE_blendfile_link_append.hh | 2 +- source/blender/blenkernel/BKE_customdata.hh | 2 +- .../blender/blenkernel/BKE_grease_pencil.hh | 2 +- .../blenkernel/BKE_image_partial_update.hh | 19 +++++++++++-------- .../blenkernel/BKE_mesh_legacy_convert.hh | 2 +- .../blender/blenkernel/intern/dynamicpaint.cc | 2 +- source/blender/blenkernel/intern/fluid.cc | 2 +- .../blenkernel/intern/image_partial_update.cc | 2 +- .../blender/blenkernel/intern/pointcache.cc | 4 ++-- source/blender/blenkernel/tracking_private.h | 4 ++-- source/blender/blenlib/BLI_vector.hh | 4 ++-- source/blender/blenlib/intern/boxpack_2d.cc | 4 ++-- .../blenlib/intern/expr_pylike_eval.cc | 2 +- source/blender/blenlib/intern/fileops_c.cc | 3 +-- .../bmesh/intern/bmesh_walkers_impl.cc | 4 ++-- .../blender/bmesh/operators/bmo_subdivide.cc | 4 +++- .../engines/eevee/eevee_lightprobe_sphere.hh | 2 +- source/blender/draw/intern/draw_cache.cc | 5 ++--- .../editors/armature/armature_select.cc | 2 +- .../gpencil_legacy/editaction_gpencil.cc | 2 +- .../interface/interface_context_menu.cc | 2 +- .../editors/interface/interface_handlers.cc | 2 +- .../regions/interface_region_menu_popup.cc | 4 ++-- .../editors/interface/views/interface_view.cc | 2 +- .../blender/editors/mesh/editmesh_select.cc | 2 +- source/blender/editors/screen/screen_ops.cc | 6 +++--- source/blender/editors/space_file/file_ops.cc | 2 +- .../Iterator/BPy_Interface0DIterator.cpp | 2 +- .../geometry/intern/mesh_boolean_manifold.cc | 2 +- source/blender/gpu/GPU_framebuffer.hh | 2 +- .../blender/io/common/intern/string_utils.cc | 2 +- source/blender/makesrna/RNA_access.hh | 4 ++-- .../makesrna/intern/rna_texture_api.cc | 2 +- .../modifiers/intern/MOD_volume_displace.cc | 2 +- .../geometry/nodes/node_geo_mesh_to_volume.cc | 2 +- source/blender/nodes/intern/node_exec.cc | 2 +- source/blender/windowmanager/WM_api.hh | 2 +- .../windowmanager/intern/wm_toolsystem.cc | 2 +- source/creator/creator_args.cc | 2 +- 57 files changed, 97 insertions(+), 90 deletions(-) diff --git a/intern/cycles/device/metal/queue.mm b/intern/cycles/device/metal/queue.mm index 3a5b4932a95..494791085dd 100644 --- a/intern/cycles/device/metal/queue.mm +++ b/intern/cycles/device/metal/queue.mm @@ -146,7 +146,7 @@ void MetalDeviceQueue::update_capture(DeviceKernel kernel) /* Handle single-capture start trigger. */ if (kernel == capture_kernel_) { - /* Start capturing when the we hit the Nth dispatch of the specified kernel. */ + /* Start capturing when we hit the Nth dispatch of the specified kernel. */ if (capture_dispatch_counter_ == 0) { begin_capture(); } diff --git a/intern/cycles/kernel/integrator/path_state.h b/intern/cycles/kernel/integrator/path_state.h index 7030f67822e..30944e8ebda 100644 --- a/intern/cycles/kernel/integrator/path_state.h +++ b/intern/cycles/kernel/integrator/path_state.h @@ -10,7 +10,7 @@ CCL_NAMESPACE_BEGIN -/* Initialize queues, so that the this path is considered terminated. +/* Initialize queues, so that this path is considered terminated. * Used for early outputs in the camera ray initialization, as well as initialization of split * states for shadow catcher. */ ccl_device_inline void path_state_init_queues(IntegratorState state) diff --git a/intern/cycles/kernel/sample/sobol_burley.h b/intern/cycles/kernel/sample/sobol_burley.h index 5d50d901d9c..17924710e76 100644 --- a/intern/cycles/kernel/sample/sobol_burley.h +++ b/intern/cycles/kernel/sample/sobol_burley.h @@ -53,8 +53,8 @@ ccl_device_forceinline float sobol_burley(uint rev_bit_index, result ^= sobol_burley_table[dimension][i + j]; i += j + 1; - /* We can't do "<<= j + 1" because that can overflow the shift - * operator, which doesn't do what we need on at least x86. */ + /* We can't do `<<= j + 1"` because that can overflow the shift + * operator, which doesn't do what we need, at least on x86. */ rev_bit_index <<= j; rev_bit_index <<= 1; } diff --git a/intern/cycles/kernel/svm/image.h b/intern/cycles/kernel/svm/image.h index 0d184dcbe2f..67faa497e67 100644 --- a/intern/cycles/kernel/svm/image.h +++ b/intern/cycles/kernel/svm/image.h @@ -155,7 +155,7 @@ ccl_device_noinline void svm_node_tex_image_box(KernelGlobals kg, * The `Nxyz` values are the barycentric coordinates in an equilateral * triangle, which in case of blending, in the middle has a smaller * equilateral triangle where 3 textures blend. this divides things into - * 7 zones, with an if() test for each zone. */ + * 7 zones, with an `if()` test for each zone. */ float3 weight = make_float3(0.0f, 0.0f, 0.0f); const float blend = __int_as_float(node.w); diff --git a/intern/cycles/scene/pass.h b/intern/cycles/scene/pass.h index 90ee6f981ef..2f6e9fcccbf 100644 --- a/intern/cycles/scene/pass.h +++ b/intern/cycles/scene/pass.h @@ -66,8 +66,8 @@ class Pass : public Node { bool is_written() const; protected: - /* The has been created automatically as a requirement to various rendering functionality (such - * as adaptive sampling). */ + /* This has been created automatically as a requirement to various rendering functionality + * (such as adaptive sampling). */ bool is_auto_; public: diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h index 75354fe6248..7cf604787a5 100644 --- a/intern/ghost/GHOST_C-api.h +++ b/intern/ghost/GHOST_C-api.h @@ -555,7 +555,7 @@ extern GHOST_TSuccess GHOST_SetDrawingContextType(GHOST_WindowHandle windowhandl GHOST_TDrawingContextType type); /** - * Returns the drawing context used in the this window. + * Returns the drawing context used by this window. * \param windowhandle: The handle to the window. * \return The window drawing context. */ diff --git a/intern/ghost/intern/GHOST_SystemWayland.cc b/intern/ghost/intern/GHOST_SystemWayland.cc index eaff33e8695..384ea1868a9 100644 --- a/intern/ghost/intern/GHOST_SystemWayland.cc +++ b/intern/ghost/intern/GHOST_SystemWayland.cc @@ -3603,7 +3603,7 @@ static void data_device_handle_drop(void *data, wl_data_device * /*wl_data_devic * Failure to set this to a known type just means the file won't have any special handling. * GHOST still generates a dropped file event. * NOTE: this string can be compared with `mime_text_plain`, `mime_text_uri` etc... - * as the this always points to the same values. */ + * as this always points to the same values. */ const char *mime_receive = ""; for (size_t i = 0; i < ARRAY_SIZE(ghost_wl_mime_preference_order); i++) { const char *type = ghost_wl_mime_preference_order[i]; @@ -7691,7 +7691,7 @@ GHOST_SystemWayland::GHOST_SystemWayland(const bool background) gwl_display_event_thread_create(display_); } /* Could be null in background mode, however there are enough - * references to this that it's safer to create it. */ + * references to the timer-manager that it's safer to create it. */ display_->ghost_timer_manager = new GHOST_TimerManager(); #endif } diff --git a/intern/ghost/intern/GHOST_SystemWin32.cc b/intern/ghost/intern/GHOST_SystemWin32.cc index 41ff8309ac4..6c3ff817c71 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cc +++ b/intern/ghost/intern/GHOST_SystemWin32.cc @@ -1342,9 +1342,9 @@ GHOST_EventKey *GHOST_SystemWin32::processKeyEvent(GHOST_WindowWin32 *window, RA } } - /* We used to check `if (key != GHOST_kKeyUnknown)`, but since the message - * values `WM_SYSKEYUP`, `WM_KEYUP` and `WM_CHAR` are ignored, we capture - * those events here as well. */ + /* We used to check `if (key != GHOST_kKeyUnknown)`, however, + * given the message values `WM_SYSKEYUP`, `WM_KEYUP` and `WM_CHAR` are ignored, + * we capture those events here as well. */ if (!is_repeated_modifier) { char utf8_char[6] = {0}; BYTE state[256]; diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index 0e8b198b0f2..23dde7a8f23 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -1177,7 +1177,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorGrab(GHOST_TGrabCursorMode mode { @autoreleasepool { if (mode != GHOST_kGrabDisable) { - /* No need to perform grab without warp as it is always on in OS X. */ + /* No need to perform grab without warp as it is always enabled in OS X. */ if (mode != GHOST_kGrabNormal) { @autoreleasepool { m_systemCocoa->getCursorPosition(m_cursorGrabInitPos[0], m_cursorGrabInitPos[1]); diff --git a/scripts/addons_core/bl_pkg/bl_extension_ops.py b/scripts/addons_core/bl_pkg/bl_extension_ops.py index 24c5f72fc66..b1bb7c2df57 100644 --- a/scripts/addons_core/bl_pkg/bl_extension_ops.py +++ b/scripts/addons_core/bl_pkg/bl_extension_ops.py @@ -2739,7 +2739,7 @@ class EXTENSIONS_OT_package_install_files(Operator, _ExtCmdMixIn): # - If it's a "local" repository, use it. # - If it's a "remote" repository, reset. # This is done because installing a file into a remote repository is a corner-case supported so - # it's possible to download large extensions before installing or to down-grade to older versions. + # it's possible to download large extensions before installing as well as down-grading to older versions. # Installing into a remote repository should be intentional, not the default. # This could be annoying to users if they want to install many files into a remote repository, # in this case they would be better off using the file selector "Install from disk" @@ -4036,7 +4036,7 @@ class EXTENSIONS_OT_userpref_allow_online_popup(Operator): ) else: lines = ( - rpt_("Please turn Online Access on in the System settings."), + rpt_("Please enable Online Access from the System settings."), "", rpt_("Internet access is required to install extensions from the internet."), ) diff --git a/scripts/addons_core/bl_pkg/cli/blender_ext.py b/scripts/addons_core/bl_pkg/cli/blender_ext.py index a0fc348e5ea..9eed290743f 100755 --- a/scripts/addons_core/bl_pkg/cli/blender_ext.py +++ b/scripts/addons_core/bl_pkg/cli/blender_ext.py @@ -1332,7 +1332,7 @@ def url_retrieve_to_data_iter( retrieve_info: DataRetrieveInfo, ) -> Iterator[bytes]: """ - Iterate over byte data downloaded from a from a URL + Iterate over byte data downloaded from a URL limited to ``chunk_size``. - The ``retrieve_info.size_hint`` diff --git a/scripts/modules/_bpy_internal/extensions/stale_file_manager.py b/scripts/modules/_bpy_internal/extensions/stale_file_manager.py index b4759fde328..337560dae66 100644 --- a/scripts/modules/_bpy_internal/extensions/stale_file_manager.py +++ b/scripts/modules/_bpy_internal/extensions/stale_file_manager.py @@ -88,7 +88,7 @@ class StaleFiles: debug = self._debug assert base_directory.endswith(sep) - # Don't support loading multiple times or after adding files. + # Don't support loading multiple times or running again after adding files. assert len(paths) == 0 stale_filepath = os.path.join(base_directory, self._stale_filename) diff --git a/scripts/modules/bpy/path.py b/scripts/modules/bpy/path.py index 73539cee5c7..7ce03387ddd 100644 --- a/scripts/modules/bpy/path.py +++ b/scripts/modules/bpy/path.py @@ -382,7 +382,7 @@ def module_names(path, *, recursive=False, package=""): fullpath = join(path, filename) modules.append((package_prefix + filename[0:-3], fullpath)) elif not filename.startswith("."): - # Skip hidden files since they are used by for version control. + # Skip hidden files since they are used for version control. directory = join(path, filename) fullpath = join(directory, "__init__.py") if isfile(fullpath): diff --git a/scripts/startup/bl_ui/space_properties.py b/scripts/startup/bl_ui/space_properties.py index b6c1d44ae93..e8fea7c2ea0 100644 --- a/scripts/startup/bl_ui/space_properties.py +++ b/scripts/startup/bl_ui/space_properties.py @@ -154,7 +154,7 @@ class PropertiesAnimationMixin: def _animated_id(cls, context): assert cls._animated_id_context_property, "set _animated_id_context_property on {!r}".format(cls) - # If the pinned ID is of a different type, there could still be a an ID + # If the pinned ID is of a different type, there could still be an ID # for which to show this panel. For example, a camera object can be # pinned, and then this panel can be shown for its camera data. return getattr(context, cls._animated_id_context_property, None) diff --git a/scripts/startup/bl_ui/space_userpref.py b/scripts/startup/bl_ui/space_userpref.py index bb6b720b2d2..aaf0c3e1d0b 100644 --- a/scripts/startup/bl_ui/space_userpref.py +++ b/scripts/startup/bl_ui/space_userpref.py @@ -2467,7 +2467,7 @@ class USERPREF_PT_addons(AddOnPanel, Panel): prefs = context.preferences if self.is_extended(): - # Rely on the draw function being appended to by the extensions add-on. + # Rely on the draw function being extended by the extensions add-on (`bl_pkg`). return layout = self.layout diff --git a/source/blender/asset_system/intern/asset_library_service.hh b/source/blender/asset_system/intern/asset_library_service.hh index 17e10cec365..ca478b496fa 100644 --- a/source/blender/asset_system/intern/asset_library_service.hh +++ b/source/blender/asset_system/intern/asset_library_service.hh @@ -80,11 +80,11 @@ class AssetLibraryService { static bUserAssetLibrary *find_custom_preferences_asset_library_from_asset_weak_ref( const AssetWeakReference &asset_reference); /** - * Turn the runtime current file library into a on-disk current file library, preserving catalog - * data like undo/redo history, deleted catalog info, catalog saving state, etc. Note that this - * creates a new on-disk asset library and destroys the runtime one. + * Turn the runtime current file library into an on-disk current file library, preserving + * catalog data like undo/redo history, deleted catalog info, catalog saving state, etc. + * Note that this creates a new on-disk asset library and destroys the runtime one. * - * Call when the .blend file is saved to disk. + * Call when the `.blend` file is saved to disk. * * \return the new on-disk current file asset library (null in case of failure to find a path to * store the library in, based on the #Main.filepath from \a main). diff --git a/source/blender/asset_system/tests/asset_library_service_test.cc b/source/blender/asset_system/tests/asset_library_service_test.cc index f2111573c73..71d541d278a 100644 --- a/source/blender/asset_system/tests/asset_library_service_test.cc +++ b/source/blender/asset_system/tests/asset_library_service_test.cc @@ -240,8 +240,10 @@ TEST_F(AssetLibraryServiceTest, has_any_unsaved_catalogs_after_write) EXPECT_FALSE(cat->flags.has_unsaved_changes); } -/** Call #AssetLibraryService::move_runtime_current_file_into_on_disk_library() with a on disk - * location that contains no existing asset catalog definition file. */ +/** + * Call #AssetLibraryService::move_runtime_current_file_into_on_disk_library() with an on disk + * location that contains no existing asset catalog definition file. + */ TEST_F(AssetLibraryServiceTest, move_runtime_current_file_into_on_disk_library__empty_directory) { AssetLibraryService *service = AssetLibraryService::get(); @@ -309,9 +311,11 @@ TEST_F(AssetLibraryServiceTest, move_runtime_current_file_into_on_disk_library__ } } -/** Call #AssetLibraryService::move_runtime_current_file_into_on_disk_library() with a on disk - * location that contains an existing asset catalog definition file. Result should be merged - * libraries. */ +/** + * Call #AssetLibraryService::move_runtime_current_file_into_on_disk_library() with an on disk + * location that contains an existing asset catalog definition file. + * Result should be merged libraries. + */ TEST_F(AssetLibraryServiceTest, move_runtime_current_file_into_on_disk_library__directory_with_catalogs) { diff --git a/source/blender/blenfont/intern/blf_internal_types.hh b/source/blender/blenfont/intern/blf_internal_types.hh index e607bf8a106..9dde72033fc 100644 --- a/source/blender/blenfont/intern/blf_internal_types.hh +++ b/source/blender/blenfont/intern/blf_internal_types.hh @@ -307,10 +307,10 @@ struct FontMetrics { }; struct FontBLF { - /** Full path to font file or NULL if from memory. */ + /** The full path to font file or NULL when from memory. */ char *filepath; - /** Pointer to in-memory font, or NULL if from file. */ + /** Pointer to in-memory font, or NULL when from a file. */ void *mem; size_t mem_size; /** Handle for in-memory fonts to avoid loading them multiple times. */ diff --git a/source/blender/blenkernel/BKE_blendfile_link_append.hh b/source/blender/blenkernel/BKE_blendfile_link_append.hh index 9b67197b2fa..595d6672fdc 100644 --- a/source/blender/blenkernel/BKE_blendfile_link_append.hh +++ b/source/blender/blenkernel/BKE_blendfile_link_append.hh @@ -233,7 +233,7 @@ void BKE_blendfile_link_append_context_library_add(BlendfileLinkAppendContext *l * * \param userdata: an opaque user-data pointer stored in generated link/append item. * - * TODO: Add a more friendly version of this that combines it with the call to + * TODO: Add a more friendly version of this function that combines it with the call to * #BKE_blendfile_link_append_context_item_library_index_enable to enable the added item for all * added library sources. */ diff --git a/source/blender/blenkernel/BKE_customdata.hh b/source/blender/blenkernel/BKE_customdata.hh index 9d239686f8e..cad99b997ea 100644 --- a/source/blender/blenkernel/BKE_customdata.hh +++ b/source/blender/blenkernel/BKE_customdata.hh @@ -330,7 +330,7 @@ void CustomData_set_only_copy(const CustomData *data, eCustomDataMask mask); * NOTE: It's expected that the destination layers are mutable * (#CustomData_ensure_layers_are_mutable). These copy-functions could ensure that internally, but * that would cause additional overhead when copying few elements at a time. It would also be - * necessary to pass the total size of the destination layers as parameter if to make them mutable + * necessary to pass the total size of the destination layers as parameter to make them mutable * though. In most cases, these functions are used right after creating a new geometry, in which * case there are no shared layers anyway. */ diff --git a/source/blender/blenkernel/BKE_grease_pencil.hh b/source/blender/blenkernel/BKE_grease_pencil.hh index e18ef63085f..bce69542f48 100644 --- a/source/blender/blenkernel/BKE_grease_pencil.hh +++ b/source/blender/blenkernel/BKE_grease_pencil.hh @@ -125,7 +125,7 @@ class Drawing : public ::GreasePencilDrawing { */ Span texture_matrices() const; /** - * Sets the matrices the that transform from a 3D point in layer-space to a 2D point in + * Sets the matrices that transform from a 3D point in layer-space to a 2D point in * texture-space */ void set_texture_matrices(Span matrices, const IndexMask &selection); diff --git a/source/blender/blenkernel/BKE_image_partial_update.hh b/source/blender/blenkernel/BKE_image_partial_update.hh index 649ba4441ec..4bb0c53982b 100644 --- a/source/blender/blenkernel/BKE_image_partial_update.hh +++ b/source/blender/blenkernel/BKE_image_partial_update.hh @@ -78,14 +78,17 @@ enum class ePartialUpdateIterResult { * * Invoke #BKE_image_partial_update_get_next_change to iterate over the collected tiles. * - * \returns ePartialUpdateCollectResult::FullUpdateNeeded: called should not use partial updates - * but recalculate the full image. This result can be expected when called for the first time for a - * user and when it isn't possible to reconstruct the changes as the internal state doesn't have - * enough data stored. ePartialUpdateCollectResult::NoChangesDetected: The have been no changes - * detected since last invoke for the same user. - * ePartialUpdateCollectResult::PartialChangesDetected: Parts of the image has been updated since - * last invoke for the same user. The changes can be read by using - * #BKE_image_partial_update_get_next_change. + * \returns + * - #ePartialUpdateCollectResult::FullUpdateNeeded: + * called should not use partial updates but recalculate the full image. + * This result can be expected when called for the first time for a + * user and when it isn't possible to reconstruct the changes as the internal state doesn't have + * enough data stored. + * - #ePartialUpdateCollectResult::NoChangesDetected: + * There have been no changes detected since last invoke for the same user. + * - #ePartialUpdateCollectResult::PartialChangesDetected: + * Parts of the image has been updated since last invoke for the same user. + * The changes can be read by using #BKE_image_partial_update_get_next_change. */ ePartialUpdateCollectResult BKE_image_partial_update_collect_changes(Image *image, PartialUpdateUser *user); diff --git a/source/blender/blenkernel/BKE_mesh_legacy_convert.hh b/source/blender/blenkernel/BKE_mesh_legacy_convert.hh index bd70d06fc61..e3cc62a4554 100644 --- a/source/blender/blenkernel/BKE_mesh_legacy_convert.hh +++ b/source/blender/blenkernel/BKE_mesh_legacy_convert.hh @@ -100,7 +100,7 @@ void BKE_mesh_tessface_ensure(Mesh *mesh); /** * Rotates the vertices of a face in case v[2] or v[3] (vertex index) is = 0. - * this is necessary to make the if #MFace.v4 check for quads work. + * this is necessary to make the `if #MFace.v4` check for quads work. */ int BKE_mesh_mface_index_validate(MFace *mface, CustomData *mfdata, int mfindex, int nr); diff --git a/source/blender/blenkernel/intern/dynamicpaint.cc b/source/blender/blenkernel/intern/dynamicpaint.cc index b0ff19a3a18..bb8ed987967 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.cc +++ b/source/blender/blenkernel/intern/dynamicpaint.cc @@ -1315,7 +1315,7 @@ void dynamicPaint_Modifier_copy(const DynamicPaintModifierData *pmd, t_brush->paint_distance = brush->paint_distance; /* NOTE: This is dangerous, as it will generate invalid data in case we are copying between - * different objects. Extra external code has to be called then to ensure proper remapping of + * different objects. Extra external code has to be called to ensure proper remapping of * that pointer. See e.g. `BKE_object_copy_particlesystems` or `BKE_object_copy_modifier`. */ t_brush->psys = brush->psys; diff --git a/source/blender/blenkernel/intern/fluid.cc b/source/blender/blenkernel/intern/fluid.cc index da71bae5a07..c9ee1bd1e21 100644 --- a/source/blender/blenkernel/intern/fluid.cc +++ b/source/blender/blenkernel/intern/fluid.cc @@ -5009,7 +5009,7 @@ void BKE_fluid_modifier_copy(const FluidModifierData *fmd, FluidModifierData *tf FluidFlowSettings *ffs = fmd->flow; /* NOTE: This is dangerous, as it will generate invalid data in case we are copying between - * different objects. Extra external code has to be called then to ensure proper remapping of + * different objects. Extra external code has to be called to ensure proper remapping of * that pointer. See e.g. `BKE_object_copy_particlesystems` or `BKE_object_copy_modifier`. */ tffs->psys = ffs->psys; tffs->noise_texture = ffs->noise_texture; diff --git a/source/blender/blenkernel/intern/image_partial_update.cc b/source/blender/blenkernel/intern/image_partial_update.cc index 11d9cd95d8a..2a41f68eb4d 100644 --- a/source/blender/blenkernel/intern/image_partial_update.cc +++ b/source/blender/blenkernel/intern/image_partial_update.cc @@ -81,7 +81,7 @@ constexpr int MAX_HISTORY_LEN = 4; /** * \brief get the chunk number for the give pixel coordinate. * - * As chunks are squares the this member can be used for both x and y axis. + * As chunks are squares this member can be used for both x and y axis. */ static int chunk_number_for_pixel(int pixel_offset) { diff --git a/source/blender/blenkernel/intern/pointcache.cc b/source/blender/blenkernel/intern/pointcache.cc index 35d5d3a21a4..db033ce2fd6 100644 --- a/source/blender/blenkernel/intern/pointcache.cc +++ b/source/blender/blenkernel/intern/pointcache.cc @@ -1879,8 +1879,8 @@ static void ptcache_data_copy(void *from[], void *to[]) { int i; for (i = 0; i < BPHYS_TOT_DATA; i++) { - /* NOTE: durian file 03.4b_comp crashes if to[i] is not tested - * its nullptr, not sure if this should be fixed elsewhere but for now its needed */ + /* NOTE: Durian file `03.4b_comp` crashes if `to[i]` is not tested + * its null, not sure if this should be fixed elsewhere but for now its needed. */ if (from[i] && to[i]) { memcpy(to[i], from[i], ptcache_data_size[i]); } diff --git a/source/blender/blenkernel/tracking_private.h b/source/blender/blenkernel/tracking_private.h index ee5bb628d9b..6e7d02dbca1 100644 --- a/source/blender/blenkernel/tracking_private.h +++ b/source/blender/blenkernel/tracking_private.h @@ -97,8 +97,8 @@ void tracking_principal_point_pixel_to_normalized(const float principal_point_pi /** * Place a disabled marker before or after specified ref_marker. * - * If before is truth, disabled marker is placed before reference - * one, and it's placed after it otherwise. + * If `before` is true, disabled marker is placed before reference one, + * and it's placed after it otherwise. * * If there's already a marker at the frame where disabled one is expected to be placed, * nothing will happen if overwrite is false. diff --git a/source/blender/blenlib/BLI_vector.hh b/source/blender/blenlib/BLI_vector.hh index c85b4b0a7fa..d37b6de0347 100644 --- a/source/blender/blenlib/BLI_vector.hh +++ b/source/blender/blenlib/BLI_vector.hh @@ -713,8 +713,8 @@ class Vector { } /** - * Insert values at the beginning of the vector. The has to move all the other elements, so it - * has a linear running time. + * Insert values at the beginning of the vector. + * This has to move all the other elements, so it has a linear running time. */ void prepend(const T &value) { diff --git a/source/blender/blenlib/intern/boxpack_2d.cc b/source/blender/blenlib/intern/boxpack_2d.cc index 5d52a7209a8..48f7cb917b0 100644 --- a/source/blender/blenlib/intern/boxpack_2d.cc +++ b/source/blender/blenlib/intern/boxpack_2d.cc @@ -468,8 +468,8 @@ void BLI_box_pack_2d( * on the bottom or side so we don't get * boxes outside the given rectangle ares * - * We can do an else/if here because only the first - * box can be at the very bottom left corner */ + * We can use `else if` here because only the first + * box can be at the very bottom left corner. */ if (box_xmin_get(box) <= 0) { box->v[TL]->free &= ~(TLF | BLF); box->v[BL]->free &= ~(TLF | BLF); diff --git a/source/blender/blenlib/intern/expr_pylike_eval.cc b/source/blender/blenlib/intern/expr_pylike_eval.cc index ee4090f2969..44c8d744e3c 100644 --- a/source/blender/blenlib/intern/expr_pylike_eval.cc +++ b/source/blender/blenlib/intern/expr_pylike_eval.cc @@ -1014,7 +1014,7 @@ static bool parse_expr(ExprParseState *state) int jmp_end = parse_add_jump(state, OPCODE_JMP); - /* Parse the else block. */ + /* Parse the `else` block. */ parse_set_jump(state, jmp_else); CHECK_ERROR(parse_expr(state)); diff --git a/source/blender/blenlib/intern/fileops_c.cc b/source/blender/blenlib/intern/fileops_c.cc index d3ce758b592..ea7d5066909 100644 --- a/source/blender/blenlib/intern/fileops_c.cc +++ b/source/blender/blenlib/intern/fileops_c.cc @@ -569,8 +569,7 @@ void *BLI_gzopen(const char *filepath, const char *mode) fclose(file); } - /* temporary #if until we update all libraries to 1.2.7 - * for correct wide char path handling */ + /* Temporary `#if` until we update all libraries to 1.2.7 for correct wide char path handling. */ # if ZLIB_VERNUM >= 0x1270 UTF16_ENCODE(filepath); diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.cc b/source/blender/bmesh/intern/bmesh_walkers_impl.cc index 203ee4192a6..a43681ac14c 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.cc +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.cc @@ -898,7 +898,7 @@ static void bmw_EdgeLoopWalker_begin(BMWalker *walker, void *data) * \endcode * * In the example above, starting from edges marked `ea/eb/ec`, - * the will detect `f_hub` and walk along the edge loop between `va -> vb`. + * they will detect `f_hub` and walk along the edge loop between `va -> vb`. * The same is true for any of the un-marked sides of the ngon, * walking stops for vertices with >= 3 connected faces (in this case they look like corners). * @@ -923,7 +923,7 @@ static void bmw_EdgeLoopWalker_begin(BMWalker *walker, void *data) * \endcode * * In the example above, starting from edges marked `eb/eb/ed/ed/ef`, - * the will detect `f_hub` and walk along the edge loop between `vb -> vd`. + * they will detect `f_hub` and walk along the edge loop between `vb -> vd`. * * Notice `vb` and `vd` delimit the loop, since the faces connected to `vb` * excluding `f_hub` don't share an edge, which isn't walked over in the case diff --git a/source/blender/bmesh/operators/bmo_subdivide.cc b/source/blender/bmesh/operators/bmo_subdivide.cc index f68d83a325b..2429204c5d2 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.cc +++ b/source/blender/bmesh/operators/bmo_subdivide.cc @@ -103,7 +103,9 @@ struct SubDPattern { #define ELE_INNER 8 #define ELE_SPLIT 16 -/* see bug #32665, 0.00005 means a we get face splits at a little under 1.0 degrees */ +/** + * A value of 0.00005 means we get face splits at a little under 1.0 degrees, see #32665. + */ #define FLT_FACE_SPLIT_EPSILON 0.00005f /* diff --git a/source/blender/draw/engines/eevee/eevee_lightprobe_sphere.hh b/source/blender/draw/engines/eevee/eevee_lightprobe_sphere.hh index d7d8be12461..88aec2d04fb 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobe_sphere.hh +++ b/source/blender/draw/engines/eevee/eevee_lightprobe_sphere.hh @@ -94,7 +94,7 @@ class SphereProbeModule { * rendering. So we tag the next redraw (or sample) to do the sync. */ bool update_probes_next_sample_ = false; - /** True if the this redraw will trigger a light-probe sphere update. */ + /** True if this redraw will trigger a light-probe sphere update. */ bool update_probes_this_sample_ = false; /** Compute world irradiance coefficient and store them into the volume probe atlas. */ bool do_world_irradiance_update = true; diff --git a/source/blender/draw/intern/draw_cache.cc b/source/blender/draw/intern/draw_cache.cc index 8d22d6e70a4..05b72f4d09a 100644 --- a/source/blender/draw/intern/draw_cache.cc +++ b/source/blender/draw/intern/draw_cache.cc @@ -544,9 +544,8 @@ void drw_batch_cache_generate_requested_evaluated_mesh_or_curve(Object *ob, Task Mesh *mesh = BKE_object_get_evaluated_mesh_no_subsurf_unchecked(ob); /* Try getting the mesh first and if that fails, try getting the curve data. - * If the curves are surfaces or have certain modifiers applied to them, the will have mesh data - * of the final result. - */ + * If the curves are surfaces or have certain modifiers applied to them, + * they will have mesh data of the final result. */ if (mesh != nullptr) { DRW_mesh_batch_cache_create_requested(task_graph, *ob, *mesh, *scene, is_paint_mode, use_hide); } diff --git a/source/blender/editors/armature/armature_select.cc b/source/blender/editors/armature/armature_select.cc index 259b60fbb23..74ce06cacf8 100644 --- a/source/blender/editors/armature/armature_select.cc +++ b/source/blender/editors/armature/armature_select.cc @@ -1111,7 +1111,7 @@ bool ED_armature_edit_select_pick_bone( ED_armature_edit_sync_selection(arm->edbo); - /* Then now check for active status. */ + /* Now check for active status. */ if (ED_armature_ebone_selectflag_get(ebone)) { arm->act_edbone = ebone; } diff --git a/source/blender/editors/gpencil_legacy/editaction_gpencil.cc b/source/blender/editors/gpencil_legacy/editaction_gpencil.cc index 118d192d76b..7137280293d 100644 --- a/source/blender/editors/gpencil_legacy/editaction_gpencil.cc +++ b/source/blender/editors/gpencil_legacy/editaction_gpencil.cc @@ -460,7 +460,7 @@ bool ED_gpencil_anim_copybuf_paste(bAnimContext *ac, const short offset_mode) * if it works, it will show up. */ LISTBASE_FOREACH (bGPDstroke *, gps, &gpfs->strokes) { - /* make a copy of stroke, then of its points array */ + /* Make a copy of stroke, then a copy of its points array. */ bGPDstroke *gpsn = BKE_gpencil_stroke_duplicate(gps, true, true); /* append stroke to frame */ diff --git a/source/blender/editors/interface/interface_context_menu.cc b/source/blender/editors/interface/interface_context_menu.cc index 6f3682e9cd8..96c6dad5196 100644 --- a/source/blender/editors/interface/interface_context_menu.cc +++ b/source/blender/editors/interface/interface_context_menu.cc @@ -349,7 +349,7 @@ static bUserMenuItem *ui_but_user_menu_find(bContext *C, uiBut *but, bUserMenu * if (but->rnaprop) { std::optional member_id_data_path = WM_context_path_resolve_full(C, &but->rnapoin); - /* NOTE(@ideasman42): It's highly unlikely a this ever occurs since the path must be resolved + /* NOTE(@ideasman42): It's highly unlikely this ever occurs since the path must be resolved * for this to be added in the first place, there might be some cases where manually * constructed RNA paths don't resolve and in this case a crash should be avoided. */ if (UNLIKELY(!member_id_data_path.has_value())) { diff --git a/source/blender/editors/interface/interface_handlers.cc b/source/blender/editors/interface/interface_handlers.cc index e77074a865d..c9426b86278 100644 --- a/source/blender/editors/interface/interface_handlers.cc +++ b/source/blender/editors/interface/interface_handlers.cc @@ -10274,7 +10274,7 @@ static bool ui_mouse_motion_towards_check(uiBlock *block, * don't mouse-out of a menu if another menu has been created after it. * if this causes problems we could remove it and check on a different fix - campbell */ if (menu->region->next) { - /* am I the last menu (test) */ + /* Test if this is the last menu. */ ARegion *region = menu->region->next; do { uiBlock *block_iter = static_cast(region->runtime->uiblocks.first); diff --git a/source/blender/editors/interface/regions/interface_region_menu_popup.cc b/source/blender/editors/interface/regions/interface_region_menu_popup.cc index 4148d1a00cc..368bc4843db 100644 --- a/source/blender/editors/interface/regions/interface_region_menu_popup.cc +++ b/source/blender/editors/interface/regions/interface_region_menu_popup.cc @@ -192,8 +192,8 @@ static void ui_popup_menu_create_block(bContext *C, * depending on vertex/edge/face mode. We still want to flag the uiBlock (but only insert into * the `puphash` if we have a title provided). Choosing an entry in a menu will still handle * `puphash` later (see `button_activate_exit`) though multiple menus without a label might fight - * for the same storage of the menu memory. Using idname instead (or in combination with the - * label) for the hash could be looked at to solve this. */ + * for the same storage of the menu memory. Using `idname` instead (or in combination with the + * label) for the hash could be investigated to solve this. */ pup->block->flag |= UI_BLOCK_POPUP_MEMORY; if (!title.is_empty()) { pup->block->puphash = ui_popup_menu_hash(title); diff --git a/source/blender/editors/interface/views/interface_view.cc b/source/blender/editors/interface/views/interface_view.cc index e0f89656366..168206a3e26 100644 --- a/source/blender/editors/interface/views/interface_view.cc +++ b/source/blender/editors/interface/views/interface_view.cc @@ -307,7 +307,7 @@ std::unique_ptr region_views_find_drop_target_at(const AReg static StringRef ui_block_view_find_idname(const uiBlock &block, const AbstractView &view) { - /* First get the idname the of the view we're looking for. */ + /* First get the `idname` of the view we're looking for. */ LISTBASE_FOREACH (ViewLink *, view_link, &block.views) { if (view_link->view.get() == &view) { return view_link->idname; diff --git a/source/blender/editors/mesh/editmesh_select.cc b/source/blender/editors/mesh/editmesh_select.cc index 14ea4dc2141..151b7638755 100644 --- a/source/blender/editors/mesh/editmesh_select.cc +++ b/source/blender/editors/mesh/editmesh_select.cc @@ -2801,7 +2801,7 @@ bool EDBM_selectmode_set_multi(bContext *C, const short selectmode) * it's not guaranteed because objects can be shared across scenes and each * scene has its own select-mode which is applied to the object when entering edit-mode. * - * This function should only be used when the an operation would cause errors + * This function should only be used when an operation would cause errors * when applied in the wrong selection mode. * * \return True when a change was made. diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc index b50cab7a023..8a0b4aaacc7 100644 --- a/source/blender/editors/screen/screen_ops.cc +++ b/source/blender/editors/screen/screen_ops.cc @@ -4524,9 +4524,9 @@ static wmOperatorStatus area_join_modal(bContext *C, wmOperator *op, const wmEve (jd->start_y > event->xy[1] && jd->split_fac < 0.5f)); if (large_v || large_h) { - /* Swap areas to follow old behavior of new area added based on starting location. If - * from above the new area is above, if from below the new area is below, etc. Note - * that this preserves runtime data, unlike ED_area_swapspace. */ + /* Swap areas to follow old behavior of new area added based on starting location. + * When from above the new area is above, when from below the new area is below, etc. + * Note that this preserves runtime data, unlike #ED_area_swapspace. */ std::swap(jd->sa1->v1, jd->sa2->v1); std::swap(jd->sa1->v2, jd->sa2->v2); std::swap(jd->sa1->v3, jd->sa2->v3); diff --git a/source/blender/editors/space_file/file_ops.cc b/source/blender/editors/space_file/file_ops.cc index 7268760053a..0c72ccd717d 100644 --- a/source/blender/editors/space_file/file_ops.cc +++ b/source/blender/editors/space_file/file_ops.cc @@ -2498,7 +2498,7 @@ static wmOperatorStatus file_smoothscroll_invoke(bContext *C, (min_curr_scroll - min_tot_scroll < 1.0f) && (middle_offset - min_middle_offset < items_block_size)); /* OR edited item must be towards the end, and we are scrolled fully to the end. - * This one is crucial (unlike the one for the beginning), because without it we won't scroll + * This one is crucial (unlike the one for the beginning), because without it scrolling * fully to the end, and last column or row will end up only partially drawn. */ const bool is_full_end = ((sfile->scroll_offset > max_middle_offset) && (max_tot_scroll - max_curr_scroll < 1.0f) && diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp index 6b30fd91f63..eb634cd48d5 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp @@ -29,7 +29,7 @@ PyDoc_STRVAR( " __init__(it)\n" "\n" " Construct a nested Interface0DIterator using either the copy constructor\n" - " or the constructor that takes an he argument of a Function0D.\n" + " or the constructor that takes an argument of a Function0D.\n" "\n" " :arg brother: An Interface0DIterator object.\n" " :type brother: :class:`Interface0DIterator`\n" diff --git a/source/blender/geometry/intern/mesh_boolean_manifold.cc b/source/blender/geometry/intern/mesh_boolean_manifold.cc index 1c011bc7f71..0d2dd1dc40e 100644 --- a/source/blender/geometry/intern/mesh_boolean_manifold.cc +++ b/source/blender/geometry/intern/mesh_boolean_manifold.cc @@ -872,7 +872,7 @@ static OutFace make_out_face(const MeshGL &mgl, int tri_index, int orig_face) * "group edge" index: linearized indices of edges in the * triangles in the group. * A SharedEdge has two such indices, with the assertion that - * they are the have the same vertices (but in opposite order). + * they have the same vertices (but in opposite order). */ struct SharedEdge { /* First shared edge ("group edge" indexing). */ diff --git a/source/blender/gpu/GPU_framebuffer.hh b/source/blender/gpu/GPU_framebuffer.hh index 38fe0c90f1b..2dfe45c9fa4 100644 --- a/source/blender/gpu/GPU_framebuffer.hh +++ b/source/blender/gpu/GPU_framebuffer.hh @@ -665,7 +665,7 @@ void GPU_offscreen_bind(GPUOffScreen *offscreen, bool save); void GPU_offscreen_unbind(GPUOffScreen *offscreen, bool restore); /** - * Read the whole color texture of the a #GPUOffScreen. + * Read the whole color texture of the #GPUOffScreen. * The pixel data will be converted to \a data_format but it needs to be compatible with the * attachment type. * IMPORTANT: \a r_data must be big enough for all pixels in \a data_format. diff --git a/source/blender/io/common/intern/string_utils.cc b/source/blender/io/common/intern/string_utils.cc index 7f04a374cb5..44b4ca5e104 100644 --- a/source/blender/io/common/intern/string_utils.cc +++ b/source/blender/io/common/intern/string_utils.cc @@ -51,7 +51,7 @@ void fixup_line_continuations(char *p, char *end) while (p < end && is_whitespace(*p) && *p != '\n') { ++p; } - /* If then we have a newline, turn both backslash + /* If we have a newline, turn both backslash * and the newline into regular spaces. */ if (p < end && *p == '\n') { *backslash = ' '; diff --git a/source/blender/makesrna/RNA_access.hh b/source/blender/makesrna/RNA_access.hh index 64e3ddb1e7e..a10db49df66 100644 --- a/source/blender/makesrna/RNA_access.hh +++ b/source/blender/makesrna/RNA_access.hh @@ -779,8 +779,8 @@ void RNA_collection_clear(PointerRNA *ptr, const char *name); * without the RNA considering it to be "set", see #IDP_FLAG_GHOST. * This is used for operators, where executing an operator that has run previously * will re-use the last value (unless #PROP_SKIP_SAVE property is set). - * In this case, the presence of the an existing value shouldn't prevent it being initialized - * from the context. Even though the this value will be returned if it's requested, + * In this case, the presence of an existing value shouldn't prevent it being initialized + * from the context. Even though this value will be returned if it's requested, * it's not considered to be set (as it would if the menu item or key-map defined it's value). * Set `use_ghost` to true for default behavior, otherwise false to check if there is a value * exists internally and would be returned on request. diff --git a/source/blender/makesrna/intern/rna_texture_api.cc b/source/blender/makesrna/intern/rna_texture_api.cc index 50e5e59e300..0bae0bb3156 100644 --- a/source/blender/makesrna/intern/rna_texture_api.cc +++ b/source/blender/makesrna/intern/rna_texture_api.cc @@ -44,7 +44,7 @@ void RNA_api_texture(StructRNA *srna) func = RNA_def_function(srna, "evaluate", "texture_evaluate"); RNA_def_function_ui_description( - func, "Evaluate the texture at the a given coordinate and returns the result"); + func, "Evaluate the texture at the given coordinate and returns the result"); parm = RNA_def_float_vector( func, diff --git a/source/blender/modifiers/intern/MOD_volume_displace.cc b/source/blender/modifiers/intern/MOD_volume_displace.cc index da11e592d4d..240a634f012 100644 --- a/source/blender/modifiers/intern/MOD_volume_displace.cc +++ b/source/blender/modifiers/intern/MOD_volume_displace.cc @@ -205,7 +205,7 @@ struct DisplaceGridOp { typename GridType::Ptr temp_grid = grid.deepCopy(); /* Dilate grid, because the currently inactive cells might become active during the displace - * operation. The quality of the approximation of the has a big impact on performance. */ + * operation. The quality of the approximation of this has a big impact on performance. */ const float max_voxel_side_length = get_max_voxel_side_length(grid); const float sample_radius = vdmd.texture_sample_radius * std::abs(vdmd.strength) / max_voxel_side_length / 2.0f; diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc index 9f7b06c5454..b880a89be0f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc @@ -38,7 +38,7 @@ static void node_declare(NodeDeclarationBuilder &b) { b.add_input("Mesh") .supported_type(GeometryComponent::Type::Mesh) - .description("Mesh to convert the inner volume of to a fog volume geometry"); + .description("Mesh to convert the inner volume to a fog volume geometry"); b.add_input("Density").default_value(1.0f).min(0.01f).max(FLT_MAX); b.add_input("Resolution Mode") .static_items(resolution_mode_items) diff --git a/source/blender/nodes/intern/node_exec.cc b/source/blender/nodes/intern/node_exec.cc index d21c5b92b07..bacf6de217b 100644 --- a/source/blender/nodes/intern/node_exec.cc +++ b/source/blender/nodes/intern/node_exec.cc @@ -52,7 +52,7 @@ void node_get_stack(bNode *node, bNodeStack *stack, bNodeStack **in, bNodeStack static void node_init_input_index(bNodeSocket *sock, int *index) { - /* Only consider existing link if from socket is valid! */ + /* Only consider existing link when the `from` socket is valid! */ if (sock->link && !(sock->link->flag & NODE_LINK_MUTED) && sock->link->fromsock && sock->link->fromsock->stack_index >= 0) { diff --git a/source/blender/windowmanager/WM_api.hh b/source/blender/windowmanager/WM_api.hh index 61760104563..6ee6d1a63f7 100644 --- a/source/blender/windowmanager/WM_api.hh +++ b/source/blender/windowmanager/WM_api.hh @@ -448,7 +448,7 @@ void WM_file_autoexec_init(const char *filepath); /** * \param use_scripts_autoexec_check: When true, script auto-execution checks excluded directories. * Note that this is passed in as an argument because `filepath` may reference a path to recover. - * In this case the that used for exclusion is the recovery path which is only known once + * In this case the file-path used for exclusion is the recovery path which is only known once * the file has been loaded. */ bool WM_file_read(bContext *C, diff --git a/source/blender/windowmanager/intern/wm_toolsystem.cc b/source/blender/windowmanager/intern/wm_toolsystem.cc index 218136206c9..b3908907066 100644 --- a/source/blender/windowmanager/intern/wm_toolsystem.cc +++ b/source/blender/windowmanager/intern/wm_toolsystem.cc @@ -511,7 +511,7 @@ static void toolsystem_ref_link(Main *bmain, WorkSpace *workspace, bToolRef *tre if (gzgt != nullptr) { if ((gzgt->flag & WM_GIZMOGROUPTYPE_TOOL_INIT) == 0) { if (!WM_gizmo_group_type_ensure_ptr(gzgt)) { - /* Even if the group-type was has been linked, it's possible the space types + /* Even if the group-type has been linked, it's possible the space types * were not previously using it. (happens with multiple windows). */ wmGizmoMapType *gzmap_type = WM_gizmomaptype_ensure(&gzgt->gzmap_params); WM_gizmoconfig_update_tag_group_type_init(gzmap_type, gzgt); diff --git a/source/creator/creator_args.cc b/source/creator/creator_args.cc index 9bbf0b6daa7..03613db8872 100644 --- a/source/creator/creator_args.cc +++ b/source/creator/creator_args.cc @@ -1552,7 +1552,7 @@ static int arg_handle_gpu_backend_set(int argc, const char **argv, void * /*data /* NOLINTBEGIN: bugprone-assignment-in-if-condition */ if (false) { - /* Just a dummy if to make the following ifdef blocks work. */ + /* Use a dummy block to make the following `ifdef` blocks work. */ } # ifdef WITH_OPENGL_BACKEND else if (STREQ(argv[1], (backends_supported[backends_supported_num++] = "opengl"))) {