diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 2 | ||||
| -rw-r--r-- | build_files/windows/find_dependencies.cmd | 2 | ||||
| -rw-r--r-- | intern/cycles/device/queue.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_customdata.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.cc | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_convert.cc | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_fill_edgeloop.c | 2 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/view_map/ViewMap.h | 2 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/winged_edge/WXEdge.cpp | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f8800fe303..f7d85969ba2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -502,7 +502,7 @@ else() set(WITH_EXPERIMENTAL_FEATURES OFF) endif() -# Unit testsing +# Unit testing option(WITH_GTESTS "Enable GTest unit testing" OFF) option(WITH_OPENGL_RENDER_TESTS "Enable OpenGL render related unit testing (Experimental)" OFF) option(WITH_OPENGL_DRAW_TESTS "Enable OpenGL UI drawing related unit testing (Experimental)" OFF) diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 77d1db97997..0a7119802c8 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -858,7 +858,7 @@ endif() # If atomic operations are possible without libatomic then linker flags are left as-is. function(CONFIGURE_ATOMIC_LIB_IF_NEEDED) # Source which is used to enforce situation when software emulation of atomics is required. - # Assume that using 64bit integer gives a definitive asnwer (as in, if 64bit atomic operations + # Assume that using 64bit integer gives a definitive answer (as in, if 64bit atomic operations # are possible using assembly/intrinsics 8, 16, and 32 bit operations will also be possible. set(_source "#include <atomic> diff --git a/build_files/windows/find_dependencies.cmd b/build_files/windows/find_dependencies.cmd index fec2bd2e752..fa893c949cf 100644 --- a/build_files/windows/find_dependencies.cmd +++ b/build_files/windows/find_dependencies.cmd @@ -5,7 +5,7 @@ for %%X in (ctest.exe) do (set CTEST=%%~$PATH:X) for %%X in (git.exe) do (set GIT=%%~$PATH:X) REM For python, default on 39 but if that does not exist also check REM the 310,311 and 312 folders to see if those are there, it checks -REM this far ahead to ensure good lib folder compatiblity in the future. +REM this far ahead to ensure good lib folder compatibility in the future. set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\39\bin\python.exe if EXIST %PYTHON% ( goto detect_python_done diff --git a/intern/cycles/device/queue.h b/intern/cycles/device/queue.h index 183ac1728a4..2bd6e7ae460 100644 --- a/intern/cycles/device/queue.h +++ b/intern/cycles/device/queue.h @@ -100,7 +100,7 @@ class DeviceQueue { * based on number of cores and/or available memory. */ virtual int num_concurrent_states(const size_t state_size) const = 0; - /* Number of states which keeps the device occupied with work without loosing performance. + /* Number of states which keeps the device occupied with work without losing performance. * The renderer will add more work (when available) when number of active paths falls below this * value. */ virtual int num_concurrent_busy_states() const = 0; diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index ea21fa9b404..940dc3c4f6c 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -716,7 +716,7 @@ void CustomData_data_transfer(const struct MeshPairRemap *me_remap, * \param write_layers_buff: An optional buffer for r_write_layers (to avoid allocating it). * \param write_layers_size: The size of pre-allocated \a write_layer_buff. * - * \warning After this funcion has ran, given custom data is no more valid from Blender POV + * \warning After this function has ran, given custom data is no more valid from Blender POV * (its `totlayer` is invalid). This function shall always be called with localized data * (as it is in write_meshes()). * diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc index 39074a5c75f..904a43a7c28 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.cc +++ b/source/blender/blenkernel/intern/DerivedMesh.cc @@ -1468,7 +1468,7 @@ static void editbmesh_calc_modifiers(struct Depsgraph *depsgraph, /* set the DerivedMesh to only copy needed data */ CustomData_MeshMasks_update(&mask, &append_mask); - /* XXX WHAT? ovewrites mask ??? */ + /* XXX WHAT? overwrites mask ??? */ /* CD_MASK_ORCO may have been cleared above */ mask = md_datamask->mask; mask.vmask |= CD_MASK_ORIGINDEX; diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 2afe4dda35c..7a97139748f 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -5515,7 +5515,7 @@ static void constraints_init_typeinfo(void) constraintsTypeInfo[12] = &CTI_ACTION; /* Action Constraint */ constraintsTypeInfo[13] = &CTI_LOCKTRACK; /* Locked-Track Constraint */ constraintsTypeInfo[14] = &CTI_DISTLIMIT; /* Limit Distance Constraint */ - constraintsTypeInfo[15] = &CTI_STRETCHTO; /* StretchTo Constaint */ + constraintsTypeInfo[15] = &CTI_STRETCHTO; /* StretchTo Constraint */ constraintsTypeInfo[16] = &CTI_MINMAX; /* Floor Constraint */ /* constraintsTypeInfo[17] = &CTI_RIGIDBODYJOINT; */ /* RigidBody Constraint - Deprecated */ constraintsTypeInfo[18] = &CTI_CLAMPTO; /* ClampTo Constraint */ diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.cc b/source/blender/bmesh/intern/bmesh_mesh_convert.cc index dcbb14e3578..fd14a3416e2 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_convert.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_convert.cc @@ -607,7 +607,7 @@ static BMVert **bm_to_mesh_vertex_map(BMesh *bm, int ototvert) * * WARNING: There is an exception to the rule of ignoring coordinates in the destination: * that is when shape-key data in `bm` can't be found (which is itself an error/exception). - * In this case our own rule is violated as the alternative is loosing the shape-data entirely. + * In this case our own rule is violated as the alternative is losing the shape-data entirely. * * Flushing Coordinates Back to the #BMesh * --------------------------------------- diff --git a/source/blender/bmesh/operators/bmo_fill_edgeloop.c b/source/blender/bmesh/operators/bmo_fill_edgeloop.c index 352b9336a20..86d204ea6a7 100644 --- a/source/blender/bmesh/operators/bmo_fill_edgeloop.c +++ b/source/blender/bmesh/operators/bmo_fill_edgeloop.c @@ -3,7 +3,7 @@ /** \file * \ingroup bmesh * - * Fill discreet edge loop(s) with faces. + * Fill discrete edge loop(s) with faces. */ #include "MEM_guardedalloc.h" diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h index 729b31965c8..fe7c2e62d9a 100644 --- a/source/blender/freestyle/intern/view_map/ViewMap.h +++ b/source/blender/freestyle/intern/view_map/ViewMap.h @@ -938,7 +938,7 @@ class ViewEdge : public Interface1D { FEdge *_FEdgeB; // last edge of the embedded fedges chain Id _Id; unsigned _ChainingTimeStamp; - // The silhouette view edge separates 2 2D spaces. The one on the left is necessarly the Shape + // The silhouette view edge separates two 2D spaces. The one on the left is necessarily the Shape // _Shape (the one to which this edge belongs to) and _aShape is the one on its right NOT HANDLED // BY THE COPY CONSTRUCTOR ViewShape *_aShape; diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp index a56ac003703..b18d232dbbe 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp +++ b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp @@ -74,7 +74,7 @@ WXSmoothEdge *WXFaceLayer::BuildSmoothEdge() //----------------------------- // We retrieve the 2 edges for which we have opposite signs for each extremity RetrieveCuspEdgesIndices(cuspEdgesIndices); - if (cuspEdgesIndices.size() != 2) { // we necessarly have 2 cusp edges + if (cuspEdgesIndices.size() != 2) { // we necessarily have 2 cusp edges return nullptr; } |