From 98f319ce0240a07898b80c89ffa40d7309b43f1d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 4 May 2024 15:24:46 +1000 Subject: [PATCH] Cleanup: spelling in comments --- intern/ghost/GHOST_C-api.h | 4 ++-- intern/ghost/GHOST_IWindow.hh | 2 +- intern/ghost/intern/GHOST_EventDragnDrop.hh | 6 +++--- intern/ghost/intern/GHOST_SystemCocoa.hh | 4 ++-- intern/ghost/intern/GHOST_SystemWin32.hh | 6 +++--- intern/ghost/intern/GHOST_SystemX11.hh | 6 +++--- intern/ghost/intern/GHOST_Window.hh | 4 ++-- intern/ghost/intern/GHOST_WindowCocoa.mm | 2 +- intern/ghost/intern/GHOST_WindowWin32.cc | 2 +- intern/ghost/intern/GHOST_XrGraphicsBinding.cc | 2 +- scripts/startup/bl_operators/view3d.py | 2 +- source/blender/blenlib/intern/math_color.cc | 2 +- source/blender/draw/engines/eevee_next/eevee_instance.cc | 4 ++-- source/blender/draw/engines/overlay/overlay_next_shape.cc | 2 +- source/blender/editors/include/UI_grid_view.hh | 2 +- source/blender/freestyle/intern/stroke/BasicStrokeShaders.h | 2 +- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h index 142796c88d5..3e93768a2a5 100644 --- a/intern/ghost/GHOST_C-api.h +++ b/intern/ghost/GHOST_C-api.h @@ -475,11 +475,11 @@ extern void GHOST_setNDOFDeadZone(float deadzone); #endif /*************************************************************************************** - * Drag'n'drop operations + * Drag & drop operations ***************************************************************************************/ /** - * Tells if the ongoing drag'n'drop object can be accepted upon mouse drop + * Tells if the ongoing drag & drop object can be accepted upon mouse drop. */ extern void GHOST_setAcceptDragOperation(GHOST_WindowHandle windowhandle, bool can_accept); diff --git a/intern/ghost/GHOST_IWindow.hh b/intern/ghost/GHOST_IWindow.hh index 3899324ff15..c3124b814e3 100644 --- a/intern/ghost/GHOST_IWindow.hh +++ b/intern/ghost/GHOST_IWindow.hh @@ -139,7 +139,7 @@ class GHOST_IWindow { virtual void clientToScreen(int32_t inX, int32_t inY, int32_t &outX, int32_t &outY) const = 0; /** - * Tells if the ongoing drag'n'drop object can be accepted upon mouse drop + * Tells if the ongoing drag & drop object can be accepted upon mouse drop */ virtual void setAcceptDragOperation(bool canAccept) = 0; diff --git a/intern/ghost/intern/GHOST_EventDragnDrop.hh b/intern/ghost/intern/GHOST_EventDragnDrop.hh index d1ce4e47890..c1f502269c2 100644 --- a/intern/ghost/intern/GHOST_EventDragnDrop.hh +++ b/intern/ghost/intern/GHOST_EventDragnDrop.hh @@ -18,16 +18,16 @@ * The dragging sequence is performed in four phases: * * - Start sequence (GHOST_kEventDraggingEntered) that tells - * a drag'n'drop operation has started. + * a drag & drop operation has started. * Already gives the object data type, and the entering mouse location * * - Update mouse position (GHOST_kEventDraggingUpdated) sent upon each mouse move until the - * drag'n'drop operation stops, to give the updated mouse position. + * drag & drop operation stops, to give the updated mouse position. * Useful to highlight a potential destination, and update the status * (through GHOST_setAcceptDragOperation) telling if the object can be dropped at the current * cursor position. * - * - Abort drag'n'drop sequence (GHOST_kEventDraggingExited) + * - Abort drag & drop sequence (#GHOST_kEventDraggingExited) * sent when the user moved the mouse outside the window. * * - Send the dropped data (GHOST_kEventDraggingDropDone) diff --git a/intern/ghost/intern/GHOST_SystemCocoa.hh b/intern/ghost/intern/GHOST_SystemCocoa.hh index 9a14e0a9013..3259b57fde5 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.hh +++ b/intern/ghost/intern/GHOST_SystemCocoa.hh @@ -140,8 +140,8 @@ class GHOST_SystemCocoa : public GHOST_System { bool handleOpenDocumentRequest(void *filepathStr); /** - * Handles a drag'n'drop destination event. Called by GHOST_WindowCocoa window subclass - * \param eventType: The type of drag'n'drop event. + * Handles a drag & drop destination event. Called by GHOST_WindowCocoa window subclass. + * \param eventType: The type of drag & drop event. * \param draggedObjectType: The type object concerned. * (currently array of file names, string, TIFF image). * \param mouseX: x mouse coordinate (in cocoa base window coordinates). diff --git a/intern/ghost/intern/GHOST_SystemWin32.hh b/intern/ghost/intern/GHOST_SystemWin32.hh index 731ecb8409b..3f22b7d0a92 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.hh +++ b/intern/ghost/intern/GHOST_SystemWin32.hh @@ -264,9 +264,9 @@ class GHOST_SystemWin32 : public GHOST_System { GHOST_DialogOptions dialog_options) const; /** - * Creates a drag'n'drop event and pushes it immediately onto the event queue. - * Called by GHOST_DropTargetWin32 class. - * \param eventType: The type of drag'n'drop event + * Creates a drag & drop event and pushes it immediately onto the event queue. + * Called by #GHOST_DropTargetWin32 class. + * \param eventType: The type of drag & drop event * \param draggedObjectType: The type object concerned * (currently array of file names, string, ?bitmap) * \param mouseX: x mouse coordinate (in window coordinates) diff --git a/intern/ghost/intern/GHOST_SystemX11.hh b/intern/ghost/intern/GHOST_SystemX11.hh index 69c04a3cac7..4715c781846 100644 --- a/intern/ghost/intern/GHOST_SystemX11.hh +++ b/intern/ghost/intern/GHOST_SystemX11.hh @@ -246,9 +246,9 @@ class GHOST_SystemX11 : public GHOST_System { GHOST_DialogOptions dialog_options) const override; #ifdef WITH_XDND /** - * Creates a drag'n'drop event and pushes it immediately onto the event queue. - * Called by GHOST_DropTargetX11 class. - * \param eventType: The type of drag'n'drop event. + * Creates a drag & drop event and pushes it immediately onto the event queue. + * Called by #GHOST_DropTargetX11 class. + * \param eventType: The type of drag & drop event. * \param draggedObjectType: The type object concerned. * (currently array of file names, string, ?bitmap) * \param mouseX: x mouse coordinate (in window coordinates). diff --git a/intern/ghost/intern/GHOST_Window.hh b/intern/ghost/intern/GHOST_Window.hh index bccfe43814d..b218fcacab0 100644 --- a/intern/ghost/intern/GHOST_Window.hh +++ b/intern/ghost/intern/GHOST_Window.hh @@ -200,7 +200,7 @@ class GHOST_Window : public GHOST_IWindow { GHOST_TSuccess getSwapInterval(int &intervalOut) override; /** - * Tells if the ongoing drag'n'drop object can be accepted upon mouse drop + * Tells if the ongoing drag & drop object can be accepted upon mouse drop. */ void setAcceptDragOperation(bool canAccept) override; @@ -401,7 +401,7 @@ class GHOST_Window : public GHOST_IWindow { /** The presence of progress indicator with the application icon */ bool m_progressBarVisible; - /** The acceptance of the "drop candidate" of the current drag'n'drop operation */ + /** The acceptance of the "drop candidate" of the current drag & drop operation. */ bool m_canAcceptDragOperation; /** Modified state : are there unsaved changes */ diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index d8e05871c3a..d60b59d7fb4 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -172,7 +172,7 @@ return (associatedWindow->isDialog() || !systemCocoa->hasDialogWindow()); } -/* The drag'n'drop dragging destination methods. */ +/* The drag & drop dragging destination methods. */ - (NSDragOperation)draggingEntered:(id)sender { NSPoint mouseLocation = [sender draggingLocation]; diff --git a/intern/ghost/intern/GHOST_WindowWin32.cc b/intern/ghost/intern/GHOST_WindowWin32.cc index 3127a0618f8..5e5172a0451 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cc +++ b/intern/ghost/intern/GHOST_WindowWin32.cc @@ -44,7 +44,7 @@ const wchar_t *GHOST_WindowWin32::s_windowClassName = L"GHOST_WindowClass"; const int GHOST_WindowWin32::s_maxTitleLength = 128; -/* force NVidia Optimus to used dedicated graphics */ +/* force NVidia OPTIMUS to used dedicated graphics */ extern "C" { __declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001; } diff --git a/intern/ghost/intern/GHOST_XrGraphicsBinding.cc b/intern/ghost/intern/GHOST_XrGraphicsBinding.cc index 390fd8818b7..87f88dac95e 100644 --- a/intern/ghost/intern/GHOST_XrGraphicsBinding.cc +++ b/intern/ghost/intern/GHOST_XrGraphicsBinding.cc @@ -465,7 +465,7 @@ class GHOST_XrGraphicsBindingD3D : public GHOST_IXrGraphicsBinding { # if 0 /* Ideally we'd just create a render target view for the OpenXR swap-chain image texture and * blit from the OpenGL context into it. The NV_DX_interop extension doesn't want to work with - * this though. At least not with Optimus hardware. See: + * this though. At least not with OPTIMUS hardware. See: * https://github.com/mpv-player/mpv/issues/2949#issuecomment-197262807. */ diff --git a/scripts/startup/bl_operators/view3d.py b/scripts/startup/bl_operators/view3d.py index 7d1caa7bf3d..2b7a4c7f701 100644 --- a/scripts/startup/bl_operators/view3d.py +++ b/scripts/startup/bl_operators/view3d.py @@ -147,7 +147,7 @@ class VIEW3D_OT_edit_mesh_extrude_move(Operator): # Don't set the constraint axis since users will expect MMB # to use the user setting, see: #61637 # "orient_type": 'NORMAL', - # Not a popular choice, too restrictive for retopo. + # Not a popular choice, too restrictive for retopology. # "constraint_axis": (True, True, False), "constraint_axis": (False, False, False), "release_confirm": False, diff --git a/source/blender/blenlib/intern/math_color.cc b/source/blender/blenlib/intern/math_color.cc index c59c54a9126..03267675fc6 100644 --- a/source/blender/blenlib/intern/math_color.cc +++ b/source/blender/blenlib/intern/math_color.cc @@ -306,7 +306,7 @@ void rgb_to_hsv_compat(float r, float g, float b, float *r_h, float *r_s, float rgb_to_hsv(r, g, b, r_h, r_s, r_v); if (*r_v <= 1e-8) { - /* Very low v values will affect the hs values, correct them in post. */ + /* Very low V values will affect the HS values, correct them in post. */ *r_h = orig_h; *r_s = orig_s; } diff --git a/source/blender/draw/engines/eevee_next/eevee_instance.cc b/source/blender/draw/engines/eevee_next/eevee_instance.cc index 9b227ce0e33..c88ecb52a85 100644 --- a/source/blender/draw/engines/eevee_next/eevee_instance.cc +++ b/source/blender/draw/engines/eevee_next/eevee_instance.cc @@ -455,8 +455,8 @@ void Instance::render_read_result(RenderLayer *render_layer, const char *view_na BLI_mutex_lock(&render->update_render_passes_mutex); /* WORKAROUND: We use texture read to avoid using a frame-buffer to get the render result. * However, on some implementation, we need a buffer with a few extra bytes for the read to - * happen correctly (see GLTexture::read()). So we need a custom memory allocation. */ - /* Avoid memcpy(), replace the pointer directly. */ + * happen correctly (see #GLTexture::read()). So we need a custom memory allocation. */ + /* Avoid #memcpy(), replace the pointer directly. */ RE_pass_set_buffer_data(rp, result); BLI_mutex_unlock(&render->update_render_passes_mutex); } diff --git a/source/blender/draw/engines/overlay/overlay_next_shape.cc b/source/blender/draw/engines/overlay/overlay_next_shape.cc index bc04ef65afc..cec48f051b5 100644 --- a/source/blender/draw/engines/overlay/overlay_next_shape.cc +++ b/source/blender/draw/engines/overlay/overlay_next_shape.cc @@ -28,7 +28,7 @@ static gpu::VertBuf *vbo_from_vector(Vector &vector) gpu::VertBuf *vbo = GPU_vertbuf_create_with_format(&format); GPU_vertbuf_data_alloc(vbo, vector.size()); Vertex *vbo_data = (Vertex *)GPU_vertbuf_get_data(vbo); - /* Copy data to VBO using a wrapper span. Could use memcpy if that's too slow. */ + /* Copy data to VBO using a wrapper span. Could use #memcpy if that's too slow. */ MutableSpan span(vbo_data, vector.size()); span.copy_from(vector); return vbo; diff --git a/source/blender/editors/include/UI_grid_view.hh b/source/blender/editors/include/UI_grid_view.hh index 05ea6c06d4b..a1438efd915 100644 --- a/source/blender/editors/include/UI_grid_view.hh +++ b/source/blender/editors/include/UI_grid_view.hh @@ -206,7 +206,7 @@ class PreviewGridItem : public AbstractGridViewItem { void build_grid_tile(uiLayout &layout) const override; /** - * \note: Takes ownership of the operator properies defined in \a op_props. + * \note Takes ownership of the operator properties defined in \a op_props. */ void build_grid_tile_button(uiLayout &layout, const wmOperatorType *ot = nullptr, diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h index 3dd0fd16b77..0b2ed6368f2 100644 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h @@ -68,7 +68,7 @@ class ConstantThicknessShader : public StrokeShader { /* [ Thickness Shader ]. * Assigns an absolute constant external thickness to every vertices of the Stroke. The external * thickness of a point is its thickness from the point to the strip border in the direction - * pointing outside the object the Stroke delimitates. + * pointing outside the object the Stroke delimiters. */ class ConstantExternThicknessShader : public StrokeShader { public: