Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-10-09 04:12:29 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-10-09 04:12:29 +0300
commitafc090f339355f55bc13eb810676358b435cf56a (patch)
tree993aaa2ecfc61499a13bc8ba441f57185da656cd
parent05710171cb5cee8ee5ea6b37213b4a64b84dcf53 (diff)
Cleanup: spelling
-rw-r--r--intern/cycles/render/osl.cpp4
-rw-r--r--intern/ghost/intern/GHOST_SystemCocoa.mm2
-rw-r--r--intern/ghost/intern/GHOST_SystemSDL.cpp4
-rw-r--r--intern/ghost/intern/GHOST_SystemWin32.h2
-rw-r--r--source/blender/blenkernel/intern/customdata.c4
5 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index 90235edd761..0c2b2cf27e9 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -76,9 +76,9 @@ OSLShaderManager::~OSLShaderManager()
void OSLShaderManager::free_memory()
{
# ifdef OSL_HAS_BLENDER_CLEANUP_FIX
- /* There is a problem with llvm+osl: The order global destructors across
+ /* There is a problem with LLVM+OSL: The order global destructors across
* different compilation units run cannot be guaranteed, on windows this means
- * that the llvm destructors run before the osl destructors, causing a crash
+ * that the LLVM destructors run before the osl destructors, causing a crash
* when the process exits. the OSL in svn has a special cleanup hack to
* sidestep this behavior */
OSL::pvt::LLVM_Util::Cleanup();
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 05d97b2dadd..c22651e2752 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -1599,7 +1599,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr)
window->getClientBounds(bounds);
/* Switch back to Cocoa coordinates orientation
- * (y=0 at bottom, the same as blender internal btw!), and to client coordinates. */
+ * (y=0 at bottom, the same as blender internal BTW!), and to client coordinates. */
window->getClientBounds(windowBounds);
window->screenToClient(bounds.m_l, bounds.m_b, correctedBounds.m_l, correctedBounds.m_t);
window->screenToClient(bounds.m_r, bounds.m_t, correctedBounds.m_r, correctedBounds.m_b);
diff --git a/intern/ghost/intern/GHOST_SystemSDL.cpp b/intern/ghost/intern/GHOST_SystemSDL.cpp
index 1769c432d96..8862d0457f2 100644
--- a/intern/ghost/intern/GHOST_SystemSDL.cpp
+++ b/intern/ghost/intern/GHOST_SystemSDL.cpp
@@ -255,8 +255,8 @@ static GHOST_TKey convertSDLKey(SDL_Scancode key)
/* keypad events */
- /* note, sdl defines a bunch of kp defines I never saw before like
- * SDL_SCANCODE_KP_PERCENT, SDL_SCANCODE_KP_XOR - campbell */
+ /* NOTE: SDL defines a bunch of key-pad identifiers that aren't supported by GHOST,
+ * such as #SDL_SCANCODE_KP_PERCENT, #SDL_SCANCODE_KP_XOR. */
GXMAP(type, SDL_SCANCODE_KP_0, GHOST_kKeyNumpad0);
GXMAP(type, SDL_SCANCODE_KP_1, GHOST_kKeyNumpad1);
GXMAP(type, SDL_SCANCODE_KP_2, GHOST_kKeyNumpad2);
diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h
index 86916b3aeeb..b91a9d7a154 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.h
+++ b/intern/ghost/intern/GHOST_SystemWin32.h
@@ -354,7 +354,7 @@ class GHOST_SystemWin32 : public GHOST_System {
* Process special keys (VK_OEM_*), to see if current key layout
* gives us anything special, like ! on french AZERTY.
* \param vKey The virtual key from hardKey
- * \param scanCode The ScanCode of pressed key (simular to PS/2 Set 1)
+ * \param scanCode The ScanCode of pressed key (similar to PS/2 Set 1)
*/
GHOST_TKey processSpecialKey(short vKey, short scanCode) const;
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 75237d77ae2..2b2b1fb70ce 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -3000,9 +3000,9 @@ void CustomData_free_elem(CustomData *data, int index, int count)
* \param weights: The weight to apply to each source value individually. If NULL, they will be
* averaged.
* \param sub_weights: The weights of sub-items, only used to affect each corners of a
- * tesselated face data (should alwasy be and array of four values).
+ * tessellated face data (should always be and array of four values).
* \param count: The number of source items to interpolate.
- * \param dest_index: Index of the destination item, in ahich to put the result of the
+ * \param dest_index: Index of the destination item, in which to put the result of the
* interpolation.
*/
void CustomData_interp(const CustomData *source,