[Bf-blender-cvs] [67ee87a6e9e] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Tue Jun 22 06:24:23 CEST 2021
Commit: 67ee87a6e9e5b42d2d9c1f25b1acf2cf7a573118
Author: Campbell Barton
Date: Tue Jun 22 14:04:08 2021 +1000
Branches: master
https://developer.blender.org/rB67ee87a6e9e5b42d2d9c1f25b1acf2cf7a573118
Cleanup: spelling
===================================================================
M intern/ghost/intern/GHOST_SystemWin32.cpp
M intern/ghost/intern/GHOST_SystemX11.cpp
M intern/ghost/intern/GHOST_WindowWin32.h
M intern/ghost/intern/GHOST_Wintab.cpp
M intern/ghost/intern/GHOST_Wintab.h
M source/blender/editors/object/object_add.c
M source/blender/editors/space_spreadsheet/spreadsheet_data_source.hh
===================================================================
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 09cfa30eca5..aa8dad44799 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -870,7 +870,7 @@ GHOST_EventButton *GHOST_SystemWin32::processButtonEvent(GHOST_TEventType type,
/* Move mouse to button event position. */
if (window->getTabletData().Active != GHOST_kTabletModeNone) {
- /* Tablet should be handling inbetween mouse moves, only move to event position. */
+ /* Tablet should be handling in between mouse moves, only move to event position. */
DWORD msgPos = ::GetMessagePos();
int msgPosX = GET_X_LPARAM(msgPos);
int msgPosY = GET_Y_LPARAM(msgPos);
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index df7e8ba59df..34b44fde48a 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -2563,7 +2563,7 @@ static bool is_filler_char(char c)
return isspace(c) || c == '_' || c == '-' || c == ';' || c == ':';
}
-/* These C functions are copied from Wine 3.12's wintab.c */
+/* These C functions are copied from Wine 3.12's `wintab.c` */
static bool match_token(const char *haystack, const char *needle)
{
const char *h, *n;
diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h
index 3c1f32476de..f28ba266ed1 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.h
+++ b/intern/ghost/intern/GHOST_WindowWin32.h
@@ -273,7 +273,7 @@ class GHOST_WindowWin32 : public GHOST_Window {
/**
* Loads Wintab context for the window.
* \param enable: True if Wintab should be enabled after loading. Wintab should not be enabled if
- * the window is minimzed.
+ * the window is minimized.
*/
void loadWintab(bool enable);
diff --git a/intern/ghost/intern/GHOST_Wintab.cpp b/intern/ghost/intern/GHOST_Wintab.cpp
index 47ef484145b..cf0309b1521 100644
--- a/intern/ghost/intern/GHOST_Wintab.cpp
+++ b/intern/ghost/intern/GHOST_Wintab.cpp
@@ -152,7 +152,7 @@ void GHOST_Wintab::modifyContext(LOGCONTEXT &lc)
lc.lcOptions |= CXO_CSRMESSAGES | CXO_MESSAGES;
/* Tablet scaling is handled manually because some drivers don't handle HIDPI or multi-display
- * correctly; reset tablet scale factors to unscaled tablet coodinates. */
+ * correctly; reset tablet scale factors to un-scaled tablet coordinates. */
lc.lcOutOrgX = lc.lcInOrgX;
lc.lcOutOrgY = lc.lcInOrgY;
lc.lcOutExtX = lc.lcInExtX;
diff --git a/intern/ghost/intern/GHOST_Wintab.h b/intern/ghost/intern/GHOST_Wintab.h
index 7193049362d..75017aa67d9 100644
--- a/intern/ghost/intern/GHOST_Wintab.h
+++ b/intern/ghost/intern/GHOST_Wintab.h
@@ -106,7 +106,7 @@ class GHOST_Wintab {
* \param x_in: The tablet x coordinate.
* \param y_in: The tablet y coordinate.
* \param x_out: Output for the Win32 mapped x coordinate.
- * \param y_out: Output for the Win32 mapped y coordiante.
+ * \param y_out: Output for the Win32 mapped y coordinate.
*/
void mapWintabToSysCoordinates(int x_in, int y_in, int &x_out, int &y_out);
@@ -140,7 +140,7 @@ class GHOST_Wintab {
bool trustCoordinates();
/**
- * Tests whether Wintab coordinates can be trusted by comparing Win32 and Wintab reported curser
+ * Tests whether Wintab coordinates can be trusted by comparing Win32 and Wintab reported cursor
* position.
* \param sysX: System cursor x position.
* \param sysY: System cursor y position.
@@ -148,7 +148,7 @@ class GHOST_Wintab {
* \param wtY: Wintab cursor y position.
* \return True if Win32 and Wintab cursor positions match within tolerance.
*
- * Note: Only test coordiantes on button press, not release. This prevents issues when async
+ * Note: Only test coordinates on button press, not release. This prevents issues when async
* mismatch causes mouse movement to replay and snap back, which is only an issue while drawing.
*/
bool testCoordinates(int sysX, int sysY, int wtX, int wtY);
@@ -160,7 +160,7 @@ class GHOST_Wintab {
GHOST_TabletData getLastTabletData();
private:
- /** Wintab dll handle. */
+ /** Wintab DLL handle. */
unique_hmodule m_handle;
/** Wintab API functions. */
GHOST_WIN32_WTInfo m_fpInfo = nullptr;
@@ -180,7 +180,7 @@ class GHOST_Wintab {
/** Pressed button map. */
GHOST_TUns8 m_buttons = 0;
- /** Range of a coodinate space. */
+ /** Range of a coordinate space. */
struct Range {
/** Origin of range. */
int org = 0;
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index aefcf68390e..b677a2f96c3 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -2648,10 +2648,10 @@ static Base *duplibase_for_convert(
ED_object_base_select(basen, BA_SELECT);
ED_object_base_select(base, BA_DESELECT);
- /* XXX An ugly hack needed because if we re-run depsgraph with some new MBall objects
- * having same 'family name' as orig ones, they will affect end result of MBall computation...
+ /* XXX: An ugly hack needed because if we re-run depsgraph with some new meta-ball objects
+ * having same 'family name' as orig ones, they will affect end result of meta-ball computation.
* For until we get rid of that name-based thingy in MBalls, that should do the trick
- * (this is weak, but other solution (to change name of obn) is even worse imho).
+ * (this is weak, but other solution (to change name of `obn`) is even worse imho).
* See T65996. */
const bool is_meta_ball = (obn->type == OB_MBALL);
void *obdata = obn->data;
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_data_source.hh b/source/blender/editors/space_spreadsheet/spreadsheet_data_source.hh
index fad1770e621..2ea7fb5809f 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source.hh
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source.hh
@@ -54,7 +54,7 @@ class DataSource {
}
/**
- * Returns true iff the data source has the ability to limit visible rows
+ * Returns true if the data source has the ability to limit visible rows
* by user interface selection status.
*/
virtual bool has_selection_filter() const
More information about the Bf-blender-cvs
mailing list