[Bf-blender-cvs] [aa867102422] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Fri Mar 5 04:45:59 CET 2021
Commit: aa8671024223368b0a4ef38c5229c270f50f2902
Author: Campbell Barton
Date: Fri Mar 5 14:33:38 2021 +1100
Branches: master
https://developer.blender.org/rBaa8671024223368b0a4ef38c5229c270f50f2902
Cleanup: spelling
===================================================================
M intern/ghost/intern/GHOST_ContextCGL.mm
M intern/ghost/intern/GHOST_SystemX11.h
M intern/ghost/intern/GHOST_WindowWin32.cpp
M source/blender/blenkernel/intern/main.c
M source/blender/editors/util/ed_draw.c
M source/blender/makesdna/DNA_ID.h
M source/blender/modifiers/intern/MOD_uvproject.c
M source/creator/creator.c
===================================================================
diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm b/intern/ghost/intern/GHOST_ContextCGL.mm
index ab76b78e6df..687173ded09 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.mm
+++ b/intern/ghost/intern/GHOST_ContextCGL.mm
@@ -278,7 +278,7 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext()
#ifdef GHOST_WAIT_FOR_VSYNC
{
GLint swapInt = 1;
- /* wait for vsync, to avoid tearing artifacts */
+ /* Wait for vertical-sync, to avoid tearing artifacts. */
[m_openGLContext setValues:&swapInt forParameter:NSOpenGLCPSwapInterval];
}
#endif
diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h
index a7e325bc9e1..ed5e945f69e 100644
--- a/intern/ghost/intern/GHOST_SystemX11.h
+++ b/intern/ghost/intern/GHOST_SystemX11.h
@@ -34,9 +34,9 @@
#ifdef WITH_X11_XINPUT
# include <X11/extensions/XInput.h>
-/* Disable xinput warp, currently not implemented by Xorg for multi-head display.
- * (see comment in xserver "Xi/xiwarppointer.c" -> "FIXME: panoramix stuff is missing" ~ v1.13.4)
- * If this is supported we can add back xinput for warping (fixing T48901).
+/* Disable XINPUT warp, currently not implemented by Xorg for multi-head display.
+ * (see comment in XSERVER `Xi/xiwarppointer.c` -> `FIXME: panoramix stuff is missing` ~ v1.13.4)
+ * If this is supported we can add back XINPUT for warping (fixing T48901).
* For now disable (see T50383). */
// # define USE_X11_XINPUT_WARP
#endif
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index 80ded9abd03..de4e77ffc24 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -1193,7 +1193,7 @@ GHOST_TSuccess GHOST_WindowWin32::setWindowCustomCursorShape(GHOST_TUns8 *bitmap
GHOST_TUns32 fullBitRow, fullMaskRow;
int x, y, cols;
- cols = sizeX / 8; /* Number of whole bytes per row (width of bm/mask). */
+ cols = sizeX / 8; /* Number of whole bytes per row (width of bitmap/mask). */
if (sizeX % 8)
cols++;
diff --git a/source/blender/blenkernel/intern/main.c b/source/blender/blenkernel/intern/main.c
index ead1c5bf721..d1f34ad8ce9 100644
--- a/source/blender/blenkernel/intern/main.c
+++ b/source/blender/blenkernel/intern/main.c
@@ -533,7 +533,7 @@ ListBase *which_libbase(Main *bmain, short type)
/**
* Put the pointers to all the #ListBase structs in given `bmain` into the `*lb[INDEX_ID_MAX]`
- * array, and return the number of those for convinience.
+ * array, and return the number of those for convenience.
*
* This is useful for generic traversal of all the blocks in a #Main (by traversing all the lists
* in turn), without worrying about block types.
diff --git a/source/blender/editors/util/ed_draw.c b/source/blender/editors/util/ed_draw.c
index 94adba36664..d7b22b4f601 100644
--- a/source/blender/editors/util/ed_draw.c
+++ b/source/blender/editors/util/ed_draw.c
@@ -116,7 +116,7 @@ BLI_INLINE bool metadata_is_valid(ImBuf *ibuf, char *r_str, short index, int off
BLI_INLINE bool metadata_is_custom_drawable(const char *field)
{
- /* Metadata field stored by Blender for multilayer EXR images. Is rather
+ /* Metadata field stored by Blender for multi-layer EXR images. Is rather
* useless to be viewed all the time. Can still be seen in the Metadata
* panel. */
if (STREQ(field, "BlenderMultiChannel")) {
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index b985ba1ed5f..14f0fef5270 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -730,7 +730,7 @@ typedef enum IDRecalcFlag {
* About Order:
* ------------
*
- * This is (losely) defined with a relationship order in mind, from lowest level (ID types using,
+ * This is (loosely) defined with a relationship order in mind, from lowest level (ID types using,
* referencing almost no other ID types) to highest level (ID types potentially using many other ID
* types).
*
diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c
index 2d4618b15df..a6b83ed60ea 100644
--- a/source/blender/modifiers/intern/MOD_uvproject.c
+++ b/source/blender/modifiers/intern/MOD_uvproject.c
@@ -135,8 +135,8 @@ static Mesh *uvprojectModifier_do(UVProjectModifierData *umd,
return mesh;
}
- /* Create a new layer if no UV Maps are available (e.g. if a preceeding modifier could not
- * preserve it). */
+ /* Create a new layer if no UV Maps are available
+ * (e.g. if a preceding modifier could not preserve it). */
if (!CustomData_has_layer(&mesh->ldata, CD_MLOOPUV)) {
CustomData_add_layer_named(
&mesh->ldata, CD_MLOOPUV, CD_DEFAULT, NULL, mesh->totloop, umd->uvlayer_name);
diff --git a/source/creator/creator.c b/source/creator/creator.c
index fbc97028d35..b40718d1f7c 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -47,7 +47,7 @@
#include "BLI_threads.h"
#include "BLI_utildefines.h"
-/* Mostly init functions. */
+/* Mostly initialization functions. */
#include "BKE_appdir.h"
#include "BKE_blender.h"
#include "BKE_brush.h"
@@ -109,8 +109,6 @@
#include "creator_intern.h" /* Own include. */
-/* Local Function prototypes. */
-
/* -------------------------------------------------------------------- */
/** \name Local Application State
* \{ */
@@ -264,7 +262,7 @@ int main(int argc,
# endif
/* Win32 Unicode Arguments. */
- /* NOTE: cannot use guardedalloc malloc here, as it's not yet initialized
+ /* NOTE: cannot use `guardedalloc` allocation here, as it's not yet initialized
* (it depends on the arguments passed in, which is what we're getting here!)
*/
{
@@ -453,8 +451,8 @@ int main(int argc,
/* Background render uses this font too. */
BKE_vfont_builtin_register(datatoc_bfont_pfb, datatoc_bfont_pfb_size);
- /* Initialize ffmpeg if built in, also needed for background-mode if videos are
- * rendered via ffmpeg. */
+ /* Initialize FFMPEG if built in, also needed for background-mode if videos are
+ * rendered via FFMPEG. */
BKE_sound_init_once();
BKE_materials_init();
@@ -524,7 +522,7 @@ int main(int argc,
#endif /* WITH_PYTHON_MODULE */
return 0;
-} /* End of int main(...) function. */
+} /* End of `int main(...)` function. */
#ifdef WITH_PYTHON_MODULE
void main_python_exit(void)
More information about the Bf-blender-cvs
mailing list