From cef82a1d39ccef24e2d3b998e4e7f9fbb95e04e7 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Fri, 24 Mar 2023 08:34:21 -0400 Subject: [PATCH] Cleanup: Grammar: "it's" vs "its" --- intern/ghost/intern/GHOST_SystemWayland.cpp | 6 +++--- scripts/modules/bpy/utils/__init__.py | 2 +- source/blender/blenkernel/BKE_deform.h | 2 +- source/blender/editors/mesh/editmesh_undo.cc | 6 +++--- .../editors/space_view3d/view3d_gizmo_preselect_type.cc | 2 +- .../blender/gpencil_modifiers/intern/lineart/MOD_lineart.h | 2 +- source/blender/python/intern/bpy_rna_array.c | 2 +- .../windowmanager/gizmo/intern/wm_gizmo_group_type.c | 2 +- source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c | 2 +- source/blender/windowmanager/intern/wm_event_system.cc | 2 +- source/blender/windowmanager/intern/wm_files.cc | 4 ++-- source/blender/windowmanager/intern/wm_operator_type.c | 2 +- tests/python/bl_pyapi_prop_array.py | 2 +- tools/check_source/check_licenses.py | 4 ++-- tools/config/analysis/valgrind.supp | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp b/intern/ghost/intern/GHOST_SystemWayland.cpp index 903c3832cf8..6bbb8527971 100644 --- a/intern/ghost/intern/GHOST_SystemWayland.cpp +++ b/intern/ghost/intern/GHOST_SystemWayland.cpp @@ -1117,7 +1117,7 @@ using GWL_RegistryHandler_UpdateFn = void (*)(GWL_Display *display, using GWL_RegistryEntry_RemoveFn = void (*)(GWL_Display *display, void *user_data, bool on_exit); struct GWL_RegistryHandler { - /** Pointer to the name (not the name it's self), needed as the values aren't set on startup. */ + /** Pointer to the name (not the name itself), needed as the values aren't set on startup. */ const char *const *interface_p = nullptr; /** Add the interface. */ @@ -3627,7 +3627,7 @@ static void tablet_seat_handle_tool_added(void *data, GWL_TabletTool *tablet_tool = new GWL_TabletTool(); tablet_tool->seat = seat; - /* Every tool has it's own cursor wl_surface. */ + /* Every tool has its own cursor wl_surface. */ tablet_tool->wl_surface_cursor = wl_compositor_create_surface(seat->system->wl_compositor()); ghost_wl_surface_tag_cursor_tablet(tablet_tool->wl_surface_cursor); @@ -3969,7 +3969,7 @@ static void keyboard_handle_key(void *data, } else if (xkb_keymap_key_repeats(xkb_state_get_keymap(seat->xkb_state), key_code)) { if (etype == GHOST_kEventKeyDown) { - /* Any other key-down always cancels (and may start it's own repeat timer). */ + /* Any other key-down always cancels (and may start its own repeat timer). */ timer_action = CANCEL; } else { diff --git a/scripts/modules/bpy/utils/__init__.py b/scripts/modules/bpy/utils/__init__.py index c5988a8b37b..8865abab186 100644 --- a/scripts/modules/bpy/utils/__init__.py +++ b/scripts/modules/bpy/utils/__init__.py @@ -70,7 +70,7 @@ _script_module_dirs = "startup", "modules" # Base scripts, this points to the directory containing: "modules" & "startup" (see `_script_module_dirs`). # In Blender's code-base this is `./scripts`. # -# NOTE: in virtually all cases this should match `BLENDER_SYSTEM_SCRIPTS` as this script is it's self a system script, +# NOTE: in virtually all cases this should match `BLENDER_SYSTEM_SCRIPTS` as this script is itself a system script, # it must be in the `BLENDER_SYSTEM_SCRIPTS` by definition and there is no need for a look-up from `_bpy_script_paths`. _script_base_dir = _os.path.dirname(_os.path.dirname(_os.path.dirname(_os.path.dirname(__file__)))) diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h index 0fae5823209..9516f524327 100644 --- a/source/blender/blenkernel/BKE_deform.h +++ b/source/blender/blenkernel/BKE_deform.h @@ -58,7 +58,7 @@ struct bDeformGroup *BKE_object_defgroup_find_name(const struct Object *ob, cons * * \param use_default: How to handle cases where no symmetrical group is found. * - false: sets these indices to -1, indicating the group should be ignored. - * - true: sets the index to its location in the array (making the group point to it's self). + * - true: sets the index to its location in the array (making the group point to itself). * Enable this for symmetrical actions which apply weight operations on symmetrical vertices * where the symmetrical group will be used (if found), otherwise the same group is used. * diff --git a/source/blender/editors/mesh/editmesh_undo.cc b/source/blender/editors/mesh/editmesh_undo.cc index 8b01f0ed052..d9aedb82878 100644 --- a/source/blender/editors/mesh/editmesh_undo.cc +++ b/source/blender/editors/mesh/editmesh_undo.cc @@ -344,9 +344,9 @@ static void um_arraystore_compact_ex(UndoMesh *um, const UndoMesh *um_ref, bool /* Compacting can be time consuming, run in parallel. * * NOTE(@ideasman42): this could be further parallelized with every custom-data layer - * running in it's own thread. If this is a bottleneck it's worth considering. - * At the moment it seems fast enough to split by element type. - * Since this is it's self a background thread, using too many threads here could + * running in its own thread. If this is a bottleneck it's worth considering. + * At the moment it seems fast enough to split by domain. + * Since this is itself a background thread, using too many threads here could * interfere with foreground tasks. */ blender::threading::parallel_invoke( 4096 < (me->totvert + me->totedge + me->totloop + me->totpoly), diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc index 83ea8310e45..d912f279b59 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc @@ -52,7 +52,7 @@ * would be used for this purpose. The problem with using poll is once the gizmo is visible again * is there is a visible flicker showing the previous location before cursor motion causes the * pre selection to be updated. While this is only a glitch, it's distracting. - * The gizmo system it's self could support this use case by tracking which gizmos draw and ensure + * The gizmo system itself could support this use case by tracking which gizmos draw and ensure * gizmos always run #wmGizmoType.test_select before drawing, however pre-selection is already * outside the scope of what gizmos are meant to be used for, so keep this workaround localized * to this gizmo type unless this seems worth supporting for more typical use-cases. diff --git a/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h b/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h index 8909e9c8ccb..018f65cda22 100644 --- a/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h +++ b/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h @@ -374,7 +374,7 @@ typedef struct LineartData { bool do_shadow_cast; bool light_reference_available; - /* Keep an copy of these data so when line art is running it's self-contained. */ + /* Keep an copy of these data so when line art is running itself contained. */ bool cam_is_persp; /* "Secondary" ones are from viewing camera * (as opposed to shadow camera), during shadow calculation. */ diff --git a/source/blender/python/intern/bpy_rna_array.c b/source/blender/python/intern/bpy_rna_array.c index 07f63d16deb..d1a351e8509 100644 --- a/source/blender/python/intern/bpy_rna_array.c +++ b/source/blender/python/intern/bpy_rna_array.c @@ -526,7 +526,7 @@ static int py_to_array(PyObject *seq, // totdim = RNA_property_array_dimension(ptr, prop, dim_size); /* UNUSED */ const int flag = RNA_property_flag(prop); - /* Use #ParameterDynAlloc which defines it's own array length. */ + /* Use #ParameterDynAlloc which defines its own array length. */ const bool prop_is_param_dyn_alloc = param_data && (flag & PROP_DYNAMIC); if (validate_array(seq, diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c index b3dfbe45b2f..111255b3dba 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c @@ -129,7 +129,7 @@ wmGizmoGroupTypeRef *WM_gizmogrouptype_append_and_link(wmGizmoMapType *gzmap_typ */ static void gizmogrouptype_free(wmGizmoGroupType *gzgt) { - /* Python gizmo group, allocates it's own string. */ + /* Python gizmo group, allocates its own string. */ if (gzgt->rna_ext.srna) { MEM_freeN((void *)gzgt->idname); } diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c index f364fb7bff6..e904d4b1989 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c @@ -106,7 +106,7 @@ void WM_gizmotype_append_ptr(void (*gtfunc)(struct wmGizmoType *, void *), void void WM_gizmotype_free_ptr(wmGizmoType *gzt) { - /* Python gizmo, allocates it's own string. */ + /* Python gizmo, allocates its own string. */ if (gzt->rna_ext.srna) { MEM_freeN((void *)gzt->idname); } diff --git a/source/blender/windowmanager/intern/wm_event_system.cc b/source/blender/windowmanager/intern/wm_event_system.cc index 710fc6f6686..9b36c77abfa 100644 --- a/source/blender/windowmanager/intern/wm_event_system.cc +++ b/source/blender/windowmanager/intern/wm_event_system.cc @@ -1149,7 +1149,7 @@ static void wm_operator_finished(bContext *C, } } else if (has_undo_step) { - /* An undo step was added but the operator wasn't registered (and won't register it's self), + /* An undo step was added but the operator wasn't registered (and won't register itself), * therefor a redo panel wouldn't redo this action but the previous registered action, * causing the "redo" to remove/loose this operator. See: #101743. * Register check is needed so nested operator calls don't clear the HUD. See: #103587. */ diff --git a/source/blender/windowmanager/intern/wm_files.cc b/source/blender/windowmanager/intern/wm_files.cc index c873c511414..0ba47e2cf4d 100644 --- a/source/blender/windowmanager/intern/wm_files.cc +++ b/source/blender/windowmanager/intern/wm_files.cc @@ -1112,7 +1112,7 @@ void wm_homefile_read_ex(bContext *C, const bool use_userdef = params_homefile->use_userdef; bool use_factory_settings = params_homefile->use_factory_settings; /* Currently this only impacts preferences as it doesn't make much sense to keep the default - * startup open in the case the app-template doesn't happen to define it's own startup. + * startup open in the case the app-template doesn't happen to define its own startup. * Unlike preferences where we might want to only reset the app-template part of the preferences * so as not to reset the preferences for all other Blender instances, see: #96427. */ const bool use_factory_settings_app_template_only = @@ -1604,7 +1604,7 @@ static void wm_history_file_update(void) * * - An image is saved to the thumbnail cache, sized at #PREVIEW_RENDER_LARGE_HEIGHT. * - * - A smaller thumbnail is stored in the `.blend` file it's self, sized at #BLEN_THUMB_SIZE. + * - A smaller thumbnail is stored in the `.blend` file itself, sized at #BLEN_THUMB_SIZE. * The size is kept small to prevent thumbnails bloating the size of `.blend` files. * * The this thumbnail will be extracted if the file is shared or the local thumbnail cache diff --git a/source/blender/windowmanager/intern/wm_operator_type.c b/source/blender/windowmanager/intern/wm_operator_type.c index b90c110efbb..ad757e711e1 100644 --- a/source/blender/windowmanager/intern/wm_operator_type.c +++ b/source/blender/windowmanager/intern/wm_operator_type.c @@ -187,7 +187,7 @@ static void operatortype_ghash_free_cb(wmOperatorType *ot) } if (ot->rna_ext.srna) { - /* A Python operator, allocates it's own string. */ + /* A Python operator, allocates its own string. */ MEM_freeN((void *)ot->idname); } diff --git a/tests/python/bl_pyapi_prop_array.py b/tests/python/bl_pyapi_prop_array.py index 5595325d60d..af66b41b7d9 100644 --- a/tests/python/bl_pyapi_prop_array.py +++ b/tests/python/bl_pyapi_prop_array.py @@ -234,7 +234,7 @@ class TestPropArrayDynamicAssign(unittest.TestCase): class TestPropArrayDynamicArg(unittest.TestCase): """ - Index array, a dynamic array argument which defines it's own length. + Index array, a dynamic array argument which defines its own length. """ dims = 8 diff --git a/tools/check_source/check_licenses.py b/tools/check_source/check_licenses.py index 6e7f8f75f39..ab4eb0e7c4b 100644 --- a/tools/check_source/check_licenses.py +++ b/tools/check_source/check_licenses.py @@ -418,7 +418,7 @@ def main() -> None: source_paths_include=(".",), source_paths_exclude=( # Directories: - # This is an exception, it has it's own CMake files we do not maintain. + # This is an exception, it has its own CMake files we do not maintain. "./extern/audaspace", "./extern/quadriflow/3rd/lemon-1.3.1", ), @@ -428,7 +428,7 @@ def main() -> None: source_paths_include=(".",), source_paths_exclude=( # Directories: - # This is an exception, it has it's own CMake files we do not maintain. + # This is an exception, it has its own CMake files we do not maintain. "./extern", "./scripts/addons_contrib", # Just data. diff --git a/tools/config/analysis/valgrind.supp b/tools/config/analysis/valgrind.supp index db4aee74445..d0239aadfbb 100644 --- a/tools/config/analysis/valgrind.supp +++ b/tools/config/analysis/valgrind.supp @@ -40,7 +40,7 @@ } ##----------------------------------------------------------------------## -# Python Calls aren't so useful unless we're debugging Python it's self +# Python Calls aren't so useful unless we're debugging Python itself # _PyObject_Free {