From bbd787275ff5cfebacc859b0789acf769dab3a36 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 25 Mar 2022 12:04:16 +1100 Subject: Cleanup: spelling in comments, strings --- source/blender/blenkernel/intern/image.cc | 2 +- source/blender/blenkernel/intern/subdiv.c | 2 +- source/blender/blenlib/BLI_timeit.hh | 2 +- source/blender/draw/intern/draw_shader_shared.h | 2 +- source/blender/editors/space_action/action_edit.c | 4 ++-- source/blender/freestyle/intern/python/BPy_MediumType.cpp | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c | 4 ++-- source/blender/python/gpu/gpu_py_state.c | 2 +- source/blender/windowmanager/intern/wm_operators.c | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc index 296364e71ca..c4f8677d199 100644 --- a/source/blender/blenkernel/intern/image.cc +++ b/source/blender/blenkernel/intern/image.cc @@ -3331,7 +3331,7 @@ void BKE_image_ensure_tile_token(char *filename) return; } - /* General u##_v### "uvtile" pattern. */ + /* General `u##_v###` `uvtile` pattern. */ pattern = std::regex(R"((.*)(u\d{1,2}_v\d{1,3})(\D.*))"); if (std::regex_search(path, match, pattern)) { BLI_strncpy(filename, match.format("$1$3").c_str(), FILE_MAX); diff --git a/source/blender/blenkernel/intern/subdiv.c b/source/blender/blenkernel/intern/subdiv.c index 7b1ebd5df1f..ee1976d5946 100644 --- a/source/blender/blenkernel/intern/subdiv.c +++ b/source/blender/blenkernel/intern/subdiv.c @@ -106,7 +106,7 @@ Subdiv *BKE_subdiv_new_from_converter(const SubdivSettings *settings, * The thing here is: OpenSubdiv can only deal with faces, but our * side of subdiv also deals with loose vertices and edges. */ } - Subdiv *subdiv = MEM_callocN(sizeof(Subdiv), "subdiv from converetr"); + Subdiv *subdiv = MEM_callocN(sizeof(Subdiv), "subdiv from converter"); subdiv->settings = *settings; subdiv->topology_refiner = osd_topology_refiner; subdiv->evaluator = NULL; diff --git a/source/blender/blenlib/BLI_timeit.hh b/source/blender/blenlib/BLI_timeit.hh index 2c89c8dd7ac..8da0a020d99 100644 --- a/source/blender/blenlib/BLI_timeit.hh +++ b/source/blender/blenlib/BLI_timeit.hh @@ -68,7 +68,7 @@ class ScopedTimerAveraged { #define SCOPED_TIMER(name) blender::timeit::ScopedTimer scoped_timer(name) /** - * Print the average and minumum runtime of the timer's scope. + * Print the average and minimum runtime of the timer's scope. * \warning This uses static variables, so it is not thread-safe. */ #define SCOPED_TIMER_AVERAGED(name) \ diff --git a/source/blender/draw/intern/draw_shader_shared.h b/source/blender/draw/intern/draw_shader_shared.h index 7c71ae9e21f..5fc76bc25e6 100644 --- a/source/blender/draw/intern/draw_shader_shared.h +++ b/source/blender/draw/intern/draw_shader_shared.h @@ -30,7 +30,7 @@ struct ViewInfos { float2 viewport_size_inverse; /** Frustum culling data. */ - /** NOTE: vec3 arrays are paded to vec4. */ + /** NOTE: vec3 arrays are padded to vec4. */ float4 frustum_corners[8]; float4 frustum_planes[6]; }; diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index f0ada312d82..d33cf70e117 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -1706,8 +1706,8 @@ static const EnumPropertyItem prop_actkeys_snap_types[] = { "NEAREST_FRAME", 0, "Selection to Nearest Frame", - "Snap selected keyframes to the nearest (whole) frame (use to fix accidental subframe " - "offsets)"}, + "Snap selected keyframes to the nearest (whole) frame " + "(use to fix accidental sub-frame offsets)"}, {ACTKEYS_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, diff --git a/source/blender/freestyle/intern/python/BPy_MediumType.cpp b/source/blender/freestyle/intern/python/BPy_MediumType.cpp index 494e01967d6..cf8e900e003 100644 --- a/source/blender/freestyle/intern/python/BPy_MediumType.cpp +++ b/source/blender/freestyle/intern/python/BPy_MediumType.cpp @@ -21,7 +21,7 @@ using namespace Freestyle; PyDoc_STRVAR(MediumType_doc, "Class hierarchy: int > :class:`MediumType`\n" "\n" - "The different blending modes available to similate the interaction\n" + "The different blending modes available to simulate the interaction\n" "media-medium:\n" "\n" "* Stroke.DRY_MEDIUM: To simulate a dry medium such as Pencil or Charcoal.\n" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c index 4b95d73036e..f8ac8d95493 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c @@ -64,7 +64,7 @@ static void copyData(const GpencilModifierData *md, GpencilModifierData *target) static float calc_min_radius_v3v3(float p1[3], float p2[3], float dir[3]) { /* Use plane-conic-intersections to choose the maximal radius. - * The conic is deifned in 4D as f({x,y,z,t}) = x*x + y*y + z*z - t*t = 0 + * The conic is defined in 4D as f({x,y,z,t}) = x*x + y*y + z*z - t*t = 0 * Then a plane is defined parametrically as * {p}(u, v) = {p1,0}*u + {p2,0}*(1-u) + {dir,1}*v with 0 <= u <= 1 and v >= 0 * Now compute the intersection point with the smallest t. @@ -281,7 +281,7 @@ static void apply_stroke_envelope( float fac = use_dist * weight; /* The 50 is an internal constant for the default pixel size. The result can be messed up if - * bGPdata.pixfactor is not default, but I think modifiers shouldn't access that. */ + * #bGPdata.pixfactor is not default, but I think modifiers shouldn't access that. */ point->pressure += fac * 50.0f * GP_DEFAULT_PIX_FACTOR; interp_v3_v3v3(&point->x, &point->x, new_center, fac / len_v3v3(closest, closest2)); } diff --git a/source/blender/python/gpu/gpu_py_state.c b/source/blender/python/gpu/gpu_py_state.c index e3ffd3cc823..fb69bb316c4 100644 --- a/source/blender/python/gpu/gpu_py_state.c +++ b/source/blender/python/gpu/gpu_py_state.c @@ -347,7 +347,7 @@ static PyObject *pygpu_state_program_point_size_set(PyObject *UNUSED(self), PyOb PyDoc_STRVAR(pygpu_state_framebuffer_active_get_doc, ".. function:: framebuffer_active_get(enable)\n" "\n" - " Return the active framefuffer in context.\n"); + " Return the active frame-buffer in context.\n"); static PyObject *pygpu_state_framebuffer_active_get(PyObject *UNUSED(self)) { GPUFrameBuffer *fb = GPU_framebuffer_active_get(); diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index c706e99b592..b45c638d7b9 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1991,7 +1991,7 @@ static void WM_OT_window_fullscreen_toggle(wmOperatorType *ot) { ot->name = "Toggle Window Fullscreen"; ot->idname = "WM_OT_window_fullscreen_toggle"; - ot->description = "Toggle the current window fullscreen"; + ot->description = "Toggle the current window full-screen"; ot->exec = wm_window_fullscreen_toggle_exec; ot->poll = WM_operator_winactive; -- cgit v1.2.3