[Bf-blender-cvs] [d1f4adab24a] master: Cleanup: spelling, correct reference to 'Mesh.mcol'
Campbell Barton
noreply at git.blender.org
Fri May 29 05:06:46 CEST 2020
Commit: d1f4adab24ad2b636de145843ab1e14ff4b41ae6
Author: Campbell Barton
Date: Fri May 29 12:58:07 2020 +1000
Branches: master
https://developer.blender.org/rBd1f4adab24ad2b636de145843ab1e14ff4b41ae6
Cleanup: spelling, correct reference to 'Mesh.mcol'
===================================================================
M intern/ghost/GHOST_C-api.h
M intern/ghost/GHOST_ISystem.h
M intern/ghost/intern/GHOST_System.h
M intern/ghost/intern/GHOST_SystemCocoa.h
M intern/ghost/intern/GHOST_SystemWin32.h
M intern/ghost/intern/GHOST_SystemX11.h
M source/blender/blenkernel/BKE_screen.h
M source/blender/editors/object/object_relations.c
M source/blender/editors/sculpt_paint/paint_vertex.c
M source/blender/editors/space_file/fsmenu.c
===================================================================
diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h
index 75527d50c6a..c7737392e7b 100644
--- a/intern/ghost/GHOST_C-api.h
+++ b/intern/ghost/GHOST_C-api.h
@@ -435,7 +435,7 @@ extern GHOST_TSuccess GHOST_SetCursorGrab(GHOST_WindowHandle windowhandle,
***************************************************************************************/
/**
- * Returns the state of a modifier key (ouside the message queue).
+ * Returns the state of a modifier key (outside the message queue).
* \param systemhandle The handle to the system
* \param mask The modifier key state to retrieve.
* \param isDown Pointer to return modifier state in.
@@ -446,7 +446,7 @@ extern GHOST_TSuccess GHOST_GetModifierKeyState(GHOST_SystemHandle systemhandle,
int *isDown);
/**
- * Returns the state of a mouse button (ouside the message queue).
+ * Returns the state of a mouse button (outside the message queue).
* \param systemhandle The handle to the system
* \param mask The button state to retrieve.
* \param isDown Pointer to return button state in.
diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h
index 9b619f5c684..33600fd1219 100644
--- a/intern/ghost/GHOST_ISystem.h
+++ b/intern/ghost/GHOST_ISystem.h
@@ -382,7 +382,7 @@ class GHOST_ISystem {
***************************************************************************************/
/**
- * Returns the state of a modifier key (ouside the message queue).
+ * Returns the state of a modifier key (outside the message queue).
* \param mask The modifier key state to retrieve.
* \param isDown The state of a modifier key (true == pressed).
* \return Indication of success.
@@ -390,7 +390,7 @@ class GHOST_ISystem {
virtual GHOST_TSuccess getModifierKeyState(GHOST_TModifierKeyMask mask, bool &isDown) const = 0;
/**
- * Returns the state of a mouse button (ouside the message queue).
+ * Returns the state of a mouse button (outside the message queue).
* \param mask The button state to retrieve.
* \param isDown Button state.
* \return Indication of success.
diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h
index 0f58be49dff..c2d712c11cd 100644
--- a/intern/ghost/intern/GHOST_System.h
+++ b/intern/ghost/intern/GHOST_System.h
@@ -219,7 +219,7 @@ class GHOST_System : public GHOST_ISystem {
***************************************************************************************/
/**
- * Returns the state of a modifier key (ouside the message queue).
+ * Returns the state of a modifier key (outside the message queue).
* \param mask The modifier key state to retrieve.
* \param isDown The state of a modifier key (true == pressed).
* \return Indication of success.
@@ -227,7 +227,7 @@ class GHOST_System : public GHOST_ISystem {
GHOST_TSuccess getModifierKeyState(GHOST_TModifierKeyMask mask, bool &isDown) const;
/**
- * Returns the state of a mouse button (ouside the message queue).
+ * Returns the state of a mouse button (outside the message queue).
* \param mask The button state to retrieve.
* \param isDown Button state.
* \return Indication of success.
@@ -247,8 +247,8 @@ class GHOST_System : public GHOST_ISystem {
***************************************************************************************/
/**
- * Sets 3D mouse deadzone
- * \param deadzone: Deadzone of the 3D mouse (both for rotation and pan) relative to full range
+ * Sets 3D mouse dead-zone
+ * \param deadzone: Dead-zone of the 3D mouse (both for rotation and pan) relative to full range.
*/
void setNDOFDeadZone(float deadzone);
#endif
@@ -295,7 +295,7 @@ class GHOST_System : public GHOST_ISystem {
virtual GHOST_TSuccess getModifierKeys(GHOST_ModifierKeys &keys) const = 0;
/**
- * Returns the state of the mouse buttons (ouside the message queue).
+ * Returns the state of the mouse buttons (outside the message queue).
* \param buttons The state of the buttons.
* \return Indication of success.
*/
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.h b/intern/ghost/intern/GHOST_SystemCocoa.h
index d058697470a..bbd6f1d8995 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.h
+++ b/intern/ghost/intern/GHOST_SystemCocoa.h
@@ -198,7 +198,7 @@ class GHOST_SystemCocoa : public GHOST_System {
GHOST_TSuccess getModifierKeys(GHOST_ModifierKeys &keys) const;
/**
- * Returns the state of the mouse buttons (ouside the message queue).
+ * Returns the state of the mouse buttons (outside the message queue).
* \param buttons The state of the buttons.
* \return Indication of success.
*/
diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h
index b23f907608c..6b7901c2ade 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.h
+++ b/intern/ghost/intern/GHOST_SystemWin32.h
@@ -212,7 +212,7 @@ class GHOST_SystemWin32 : public GHOST_System {
GHOST_TSuccess getModifierKeys(GHOST_ModifierKeys &keys) const;
/**
- * Returns the state of the mouse buttons (ouside the message queue).
+ * Returns the state of the mouse buttons (outside the message queue).
* \param buttons The state of the buttons.
* \return Indication of success.
*/
diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h
index bb01ef7e0cc..5888605ec95 100644
--- a/intern/ghost/intern/GHOST_SystemX11.h
+++ b/intern/ghost/intern/GHOST_SystemX11.h
@@ -182,7 +182,7 @@ class GHOST_SystemX11 : public GHOST_System {
GHOST_TSuccess getModifierKeys(GHOST_ModifierKeys &keys) const;
/**
- * Returns the state of the mouse buttons (ouside the message queue).
+ * Returns the state of the mouse buttons (outside the message queue).
* \param buttons The state of the buttons.
* \return Indication of success.
*/
@@ -211,7 +211,7 @@ class GHOST_SystemX11 : public GHOST_System {
}
#endif
- /* Helped function for get data from the clipboard. */
+ /** Helped function for get data from the clipboard. */
void getClipboard_xcout(const XEvent *evt,
Atom sel,
Atom target,
@@ -337,7 +337,7 @@ class GHOST_SystemX11 : public GHOST_System {
private:
Display *m_display;
- /* Use for scancode lookups. */
+ /** Use for scan-code look-ups. */
XkbDescRec *m_xkb_descr;
#if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
@@ -349,20 +349,22 @@ class GHOST_SystemX11 : public GHOST_System {
std::vector<GHOST_TabletX11> m_xtablets;
#endif
- /// The vector of windows that need to be updated.
+ /** The vector of windows that need to be updated. */
std::vector<GHOST_WindowX11 *> m_dirty_windows;
- /// Start time at initialization.
+ /** Start time at initialization. */
GHOST_TUns64 m_start_time;
- /// A vector of keyboard key masks
+ /** A vector of keyboard key masks. */
char m_keyboard_vector[32];
- /* to prevent multiple warp, we store the time of the last warp event
- * and stop accumulating all events generated before that */
+ /**
+ * To prevent multiple warp, we store the time of the last warp event
+ * and stop accumulating all events generated before that.
+ */
Time m_last_warp;
- /* detect autorepeat glitch */
+ /* Detect auto-repeat glitch. */
unsigned int m_last_release_keycode;
Time m_last_release_time;
diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h
index 85c7c92a01d..fc7146b8cf4 100644
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@ -234,17 +234,17 @@ typedef struct PanelType {
/** Reorder function, called when drag and drop finishes. */
void (*reorder)(struct bContext *C, struct Panel *pa, int new_index);
/**
- * Get the panel and subpanel's expansion state from the expansion flag in the corresponding data
- * item. Called on draw updates.
- * \note Subpanels are indexed in depth first order, the visualorder you would see if all panels
- * were expanded.
+ * Get the panel and sub-panel's expansion state from the expansion flag in the corresponding
+ * data item. Called on draw updates.
+ * \note Sub-panels are indexed in depth first order,
+ * the visual order you would see if all panels were expanded.
*/
short (*get_list_data_expand_flag)(const struct bContext *C, struct Panel *pa);
/**
- * Set the expansion bitfield from the closed / open state of this panel and its subpanels.
+ * Set the expansion bit-field from the closed / open state of this panel and its sub-panels.
* Called when the expansion state of the panel changes with user input.
- * \note Subpanels are indexed in depth first order, the visual order you would see if all panels
- * were expanded.
+ * \note Sub-panels are indexed in depth first order,
+ * the visual order you would see if all panels were expanded.
*/
void (*set_list_data_expand_flag)(const struct bContext *C, struct Panel *pa, short expand_flag);
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index bfceaef4644..11e9c396552 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -2072,7 +2072,7 @@ void ED_object_single_users(Main *bmain,
/* Duplicating obdata and other IDs may require another update of the collections and objects
* pointers, especially regarding drivers and custom props, see T66641.
- * Note that this whole scene duplication code and 'make single user' functions have te be
+ * Note that this whole scene duplication code and 'make single user' functions have to be
* rewritten at some point to make use of proper modern ID management code,
* but that is no small task.
* For now we are doomed to that kind of band-aid to try to cover most of remapping cases. */
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_pa
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list