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--source/blender/bmesh/intern/bmesh_log.c2
-rw-r--r--source/blender/bmesh/operators/bmo_primitive.c2
-rw-r--r--source/blender/bmesh/operators/bmo_subdivide_edgering.c2
-rw-r--r--source/blender/bmesh/operators/bmo_triangulate.c2
-rw-r--r--source/blender/bmesh/tools/bmesh_bevel.c4
-rw-r--r--source/blender/bmesh/tools/bmesh_bisect_plane.c2
-rw-r--r--source/blender/editors/object/object_add.c4
-rw-r--r--source/blender/editors/screen/screen_draw.c2
-rw-r--r--source/blender/editors/transform/transform_conversions.c2
-rw-r--r--source/blender/python/mathutils/mathutils_Matrix.c2
-rw-r--r--source/blender/windowmanager/intern/wm_files.c2
11 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c
index 732647f83a7..f0e82e6ae38 100644
--- a/source/blender/bmesh/intern/bmesh_log.c
+++ b/source/blender/bmesh/intern/bmesh_log.c
@@ -655,7 +655,7 @@ void BM_log_mesh_elems_reorder(BMesh *bm, BMLog *log)
BMLogEntry *BM_log_entry_add(BMLog *log)
{
/* WARNING: this is now handled by the UndoSystem: BKE_UNDOSYS_TYPE_SCULPT
- * freeing here causes unnecesssary complications. */
+ * freeing here causes unnecessary complications. */
BMLogEntry *entry;
#if 0
/* Delete any entries after the current one */
diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c
index dee61440bc9..b4f41790a81 100644
--- a/source/blender/bmesh/operators/bmo_primitive.c
+++ b/source/blender/bmesh/operators/bmo_primitive.c
@@ -1099,7 +1099,7 @@ static void bm_mesh_calc_uvs_sphere_face(BMFace *f, const int cd_loop_uv_offset)
BLI_assert(f->len <= 4);
/* If face has 3 vertices, it's a polar face, in which case we need to
- * compute a nearbye to determine its latitude. */
+ * compute a nearby to determine its latitude. */
float avgx = 0.0f, avgy = 0.0f;
BM_ITER_ELEM_INDEX (l, &iter, f, BM_LOOPS_OF_FACE, loop_index) {
if (f->len == 3) {
diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.c b/source/blender/bmesh/operators/bmo_subdivide_edgering.c
index 251a79e8ff5..ade9b4ce8b7 100644
--- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c
+++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c
@@ -34,7 +34,7 @@
* - verts use BM_ELEM_TAG, these need to be cleared before functions exit.
*
* \note Order of execution with 2+ rings is undefined,
- * so tage care
+ * so take care.
*/
#include "MEM_guardedalloc.h"
diff --git a/source/blender/bmesh/operators/bmo_triangulate.c b/source/blender/bmesh/operators/bmo_triangulate.c
index e686ef0429a..8b096e25746 100644
--- a/source/blender/bmesh/operators/bmo_triangulate.c
+++ b/source/blender/bmesh/operators/bmo_triangulate.c
@@ -267,7 +267,7 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op)
}
else {
/* Edges with 1 or 3+ faces attached,
- * most likely caused by a degeneratge mesh. */
+ * most likely caused by a degenerate mesh. */
}
}
}
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index ad576e61acb..8499db2fdb5 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -2194,7 +2194,7 @@ static void print_adjust_stats(BoundVert *vstart)
* residual in terms of that one degree of freedom.
* Unfortunately, the results are in some cases worse than the general least squares solution
* for the combined (with weights) problem, so this code is not used.
- * But keep it here for a while in case peformance issues demand that it be used sometimes. */
+ * But keep it here for a while in case performance issues demand that it be used sometimes. */
static bool adjust_the_cycle_or_chain_fast(BoundVert *vstart, int np, bool iscycle)
{
BoundVert *v;
@@ -2423,7 +2423,7 @@ static void adjust_the_cycle_or_chain(BoundVert *vstart, bool iscycle)
/* Adjust the offsets to try to make them, as much as possible,
* have even-width bevels with offsets that match their specs.
- * The problem that we can try to amelieroate is that when loop slide
+ * The problem that we can try to ameliorate is that when loop slide
* is active, the meet point will probably not be the one that makes
* both sides have their specified width. And because both ends may be
* on loop slide edges, the widths at each end could be different.
diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c
index 13ff04b0e2e..b78deaa1d5f 100644
--- a/source/blender/bmesh/tools/bmesh_bisect_plane.c
+++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c
@@ -26,7 +26,7 @@
* Cut the geometry in half using a plane.
*
* \par Implementation
- * This simply works by splitting tagged edges whos verts span either side of
+ * This simply works by splitting tagged edges who's verts span either side of
* the plane, then splitting faces along their dividing verts.
* The only complex case is when a ngon spans the axis multiple times,
* in this case we need to do some extra checks to correctly bisect the ngon.
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index a760086abae..c481a62acb7 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1860,8 +1860,8 @@ static int convert_exec(bContext *C, wmOperator *op)
Object *ob = base->object;
/* The way object type conversion works currently (enforcing conversion of *all* objects using converted
- * obdata, even some un-selected/hidden/inother scene ones, sounds totally bad to me.
- * However, changing this is more design than bugfix, not to mention convoluted code below,
+ * object-data, even some un-selected/hidden/another scene ones, sounds totally bad to me.
+ * However, changing this is more design than bug-fix, not to mention convoluted code below,
* so that will be for later.
* But at the very least, do not do that with linked IDs! */
if ((ID_IS_LINKED(ob) || (ob->data && ID_IS_LINKED(ob->data))) && !keep_original) {
diff --git a/source/blender/editors/screen/screen_draw.c b/source/blender/editors/screen/screen_draw.c
index 679bd66753b..ca3707786dd 100644
--- a/source/blender/editors/screen/screen_draw.c
+++ b/source/blender/editors/screen/screen_draw.c
@@ -307,7 +307,7 @@ static void scrarea_draw_shape_dark(ScrArea *sa, char dir, unsigned int pos)
}
/**
- * Draw screen area ligher with arrow shape ("eraser" of previous dark shape).
+ * Draw screen area lighter with arrow shape ("eraser" of previous dark shape).
*/
static void scrarea_draw_shape_light(ScrArea *sa, char UNUSED(dir), unsigned int pos)
{
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 3576406ee0b..6d8f487b755 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -2728,7 +2728,7 @@ static void createTransEditVerts(TransInfo *t)
}
copy_m3_m4(mtx, tc->obedit->obmat);
- /* we use a pseudoinverse so that when one of the axes is scaled to 0,
+ /* we use a pseudo-inverse so that when one of the axes is scaled to 0,
* matrix inversion still works and we can still moving along the other */
pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON);
diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c
index 76921b69d1a..c033a990901 100644
--- a/source/blender/python/mathutils/mathutils_Matrix.c
+++ b/source/blender/python/mathutils/mathutils_Matrix.c
@@ -354,7 +354,7 @@ static PyObject *Matrix_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
/* Input is now as a sequence of rows so length of sequence
* is the number of rows */
- /* -1 is an error, size checks will accunt for this */
+ /* -1 is an error, size checks will account for this */
const unsigned short num_row = PySequence_Size(arg);
if (num_row >= 2 && num_row <= 4) {
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 0bf24b3e615..23c60c33d61 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -678,7 +678,7 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports)
}
-struct {
+static struct {
char app_template[64];
bool override;
} wm_init_state_app_template = {{0}};