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:
-rw-r--r--intern/cycles/kernel/kernels/opencl/kernel_opencl_image.h2
-rw-r--r--intern/cycles/render/geometry.cpp4
-rw-r--r--intern/ghost/intern/GHOST_DropTargetX11.h2
-rw-r--r--source/blender/bmesh/tools/bmesh_bevel.c4
-rw-r--r--source/blender/makesdna/DNA_ID.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_opencl_image.h b/intern/cycles/kernel/kernels/opencl/kernel_opencl_image.h
index d87e5f193ad..bb6b8a40e8e 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel_opencl_image.h
+++ b/intern/cycles/kernel/kernels/opencl/kernel_opencl_image.h
@@ -18,7 +18,7 @@
/* Data type to replace `double` used in the NanoVDB headers. Cycles don't need doubles, and is
* safer and more portable to never use double datatype on GPU.
* Use a special structure, so that the following is true:
- * - No unnoticed implicit cast or mathermatical operations used on scalar 64bit type
+ * - No unnoticed implicit cast or mathematical operations used on scalar 64bit type
* (which rules out trick like using `uint64_t` as a drop-in replacement for double).
* - Padding rules are matching exactly `double`
* (which rules out array of `uint8_t`). */
diff --git a/intern/cycles/render/geometry.cpp b/intern/cycles/render/geometry.cpp
index 38e84cfa8f3..beee0b797ee 100644
--- a/intern/cycles/render/geometry.cpp
+++ b/intern/cycles/render/geometry.cpp
@@ -1275,8 +1275,8 @@ void GeometryManager::device_update_bvh(Device *device,
dscene->prim_tri_verts.give_data(pack.prim_tri_verts);
}
else {
- /* it is not stricly necessary to skip those resizes we if do not have to repack, as the OS
- * will not allocate pages if we do not touch them, however it does help catching bugs */
+ /* It is not strictly necessary to skip those resizes we if do not have to repack, as the OS
+ * will not allocate pages if we do not touch them, however it does help catching bugs. */
pack.prim_tri_index.resize(num_prims);
pack.prim_tri_verts.resize(num_tri_verts);
pack.prim_type.resize(num_prims);
diff --git a/intern/ghost/intern/GHOST_DropTargetX11.h b/intern/ghost/intern/GHOST_DropTargetX11.h
index 69f6fec7ac1..7d777270317 100644
--- a/intern/ghost/intern/GHOST_DropTargetX11.h
+++ b/intern/ghost/intern/GHOST_DropTargetX11.h
@@ -109,7 +109,7 @@ class GHOST_DropTargetX11 {
/* class holding internal stiff of xdnd library */
static DndClass m_dndClass;
- /* list of supported types to eb draggeg into */
+ /* list of supported types to be dragged into */
static Atom *m_dndTypes;
/* list of supported dran'n'drop actions */
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 9497466723a..44d146bc155 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -7211,14 +7211,14 @@ static void set_profile_spacing(BevelParams *bp, ProfileSpacing *pro_spacing, bo
*
* where edges are A, B, and C, following a face around vertices a, b, c, d.
* th1 is angle abc and th2 is angle bcd;
- * and the argument EdgeHalf eb is B, going from b to c.
+ * and the argument `EdgeHalf eb` is B, going from b to c.
* In general case, edge offset specs for A, B, C have
* the form ka*t, kb*t, kc*t where ka, kb, kc are some factors
* (may be 0) and t is the current bp->offset.
* We want to calculate t at which the clone of B parallel
* to it collapses. This can be calculated using trig.
* Another case of geometry collision that can happen is
- * When B slides along A because A is unbeveled.
+ * When B slides along A because A is un-beveled.
* Then it might collide with a. Similarly for B sliding along C.
*/
static float geometry_collide_offset(BevelParams *bp, EdgeHalf *eb)
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 61a93982e36..89c7ba0cca7 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -685,7 +685,7 @@ typedef enum IDRecalcFlag {
* redraw update in that case. */
/* Selection of the ID itself or its components (for example, vertices) did
- * change, and all the drawing data is to eb updated. */
+ * change, and all the drawing data is to be updated. */
ID_RECALC_SELECT = (1 << 9),
/* Flags on the base did change, and is to be copied onto all the copies of
* corresponding objects. */