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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-02-09 02:42:00 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-02-09 02:42:00 +0300
commiteab9165c2512581b918d8bfca40ec98ded08a84a (patch)
tree7eaef1101f8db4d8745763081a7214d287a36bae /source
parent3b1c7a6d6f2dfc4a72a1b33217366db6173d8d71 (diff)
Cleanup: spelling
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/brush.c2
-rw-r--r--source/blender/blenkernel/intern/paint.c2
-rw-r--r--source/blender/blenkernel/intern/undo_system.c4
-rw-r--r--source/blender/blenlib/intern/convexhull_2d.c2
-rw-r--r--source/blender/blenlib/intern/delaunay_2d.cc2
-rw-r--r--source/blender/blenlib/intern/mesh_boolean.cc10
-rw-r--r--source/blender/blenloader/intern/readfile.c8
-rw-r--r--source/blender/blenloader/intern/versioning_270.c2
-rw-r--r--source/blender/bmesh/intern/bmesh_error.h2
-rw-r--r--source/blender/bmesh/intern/bmesh_mods.c6
-rw-r--r--source/blender/bmesh/intern/bmesh_opdefines.c2
-rw-r--r--source/blender/bmesh/intern/bmesh_structure.c2
-rw-r--r--source/blender/bmesh/tools/bmesh_bevel.c20
-rw-r--r--source/blender/draw/intern/draw_manager.c2
-rw-r--r--source/blender/editors/space_image/image_ops.c2
-rw-r--r--source/blender/editors/space_info/info_draw.c2
-rw-r--r--source/blender/editors/undo/memfile_undo.c2
-rw-r--r--source/blender/editors/util/ed_util.c2
-rw-r--r--source/blender/makesdna/DNA_ID_enums.h4
-rw-r--r--source/blender/makesrna/intern/rna_rna.c4
-rw-r--r--source/blender/render/intern/texture_image.c2
21 files changed, 43 insertions, 41 deletions
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 9fbefacbece..8a2ab818464 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -375,7 +375,7 @@ static int brush_undo_preserve_cb(LibraryIDLinkCallbackData *cb_data)
static void brush_undo_preserve(BlendLibReader *reader, ID *id_new, ID *id_old)
{
- /* Whole Brush is preserved across undos. */
+ /* Whole Brush is preserved across undoes. */
BKE_lib_id_swap(NULL, id_new, id_old);
/* `id_new` now has content from `id_old`, we need to ensure those old ID pointers are valid.
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 98ee9e1da75..8b5137621a0 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -127,7 +127,7 @@ static void palette_blend_read_data(BlendDataReader *reader, ID *id)
static void palette_undo_preserve(BlendLibReader *UNUSED(reader), ID *id_new, ID *id_old)
{
- /* Whole Palette is preserved across undos, and it has no extra pointer, simple. */
+ /* Whole Palette is preserved across undoes, and it has no extra pointer, simple. */
/* Note: We do not care about potential internal references to self here, Palette has none. */
/* Note: We do not swap IDProperties, as dealing with potential ID pointers in those would be
* fairly delicate. */
diff --git a/source/blender/blenkernel/intern/undo_system.c b/source/blender/blenkernel/intern/undo_system.c
index 07e7d07f1ef..baa96ca1455 100644
--- a/source/blender/blenkernel/intern/undo_system.c
+++ b/source/blender/blenkernel/intern/undo_system.c
@@ -287,7 +287,7 @@ void BKE_undosys_stack_clear(UndoStack *ustack)
void BKE_undosys_stack_clear_active(UndoStack *ustack)
{
- /* Remove active and all following undos. */
+ /* Remove active and all following undoes. */
UndoStep *us = ustack->step_active;
if (us) {
@@ -517,7 +517,7 @@ UndoPushReturn BKE_undosys_step_push_with_type(UndoStack *ustack,
retval |= UNDO_PUSH_RET_OVERRIDE_CHANGED;
}
- /* Remove all undos after (also when 'ustack->step_active == NULL'). */
+ /* Remove all undoes after (also when 'ustack->step_active == NULL'). */
while (ustack->steps.last != ustack->step_active) {
UndoStep *us_iter = ustack->steps.last;
undosys_step_free_and_unlink(ustack, us_iter);
diff --git a/source/blender/blenlib/intern/convexhull_2d.c b/source/blender/blenlib/intern/convexhull_2d.c
index a3d24787d27..cb4ef54bfb7 100644
--- a/source/blender/blenlib/intern/convexhull_2d.c
+++ b/source/blender/blenlib/intern/convexhull_2d.c
@@ -28,7 +28,7 @@
#include "BLI_strict_flags.h"
#include "BLI_utildefines.h"
-/* Copyright 2001, softSurfer (www.softsurfer.com)
+/* Copyright 2001, softSurfer (http://www.softsurfer.com)
* This code may be freely used and modified for any purpose
* providing that this copyright notice is included with it.
* SoftSurfer makes no warranty for this code, and cannot be held
diff --git a/source/blender/blenlib/intern/delaunay_2d.cc b/source/blender/blenlib/intern/delaunay_2d.cc
index 1cf2046ce16..06a749ab921 100644
--- a/source/blender/blenlib/intern/delaunay_2d.cc
+++ b/source/blender/blenlib/intern/delaunay_2d.cc
@@ -1500,7 +1500,7 @@ template<typename T> static void re_delaunay_triangulate(CDTArrangement<T> *cdt,
cse = ss;
}
}
- /* Add diagonals necessary to make abc a triangle. */
+ /* Add diagonals necessary to make `abc` a triangle. */
CDTEdge<T> *ebc = nullptr;
CDTEdge<T> *eca = nullptr;
if (!exists_edge(b, c)) {
diff --git a/source/blender/blenlib/intern/mesh_boolean.cc b/source/blender/blenlib/intern/mesh_boolean.cc
index 09b6ffc1fd9..6ca5be743f0 100644
--- a/source/blender/blenlib/intern/mesh_boolean.cc
+++ b/source/blender/blenlib/intern/mesh_boolean.cc
@@ -2403,8 +2403,8 @@ static void inside_shape_callback(void *userdata,
* how likely we think it is that it is inside.
* This is done by casting some rays from just on the positive side of a test
* face in various directions and summing the parity of crossing faces of each face.
- * The BVHtree \a tree contains all the triangles of \a tm and can be used for
- * fast raycasting.
+ *
+ * \param tree: Contains all the triangles of \a tm and can be used for fast ray-casting.
*/
static void test_tri_inside_shapes(const IMesh &tm,
std::function<int(int)> shape_fn,
@@ -2424,7 +2424,7 @@ static void test_tri_inside_shapes(const IMesh &tm,
return;
}
double3 test_point = calc_point_inside_tri_db(tri_test);
- /* Offset the test point a tiny bit in the tri_test normal direcction. */
+ /* Offset the test point a tiny bit in the tri_test normal direction. */
tri_test.populate_plane(false);
double3 norm = tri_test.plane->norm.normalized();
const double offset_amount = 1e-5;
@@ -2436,8 +2436,8 @@ static void test_tri_inside_shapes(const IMesh &tm,
}
/* Try six test rays almost along orthogonal axes.
* Perturb their directions slightly to make it less likely to hit a seam.
- * Raycast assumes they have unit length, so use r1 near 1 and
- * ra near 0.5, and rb near .01, but normalized so sqrt(r1^2 + ra^2 + rb^2) == 1. */
+ * Ray-cast assumes they have unit length, so use r1 near 1 and
+ * ra near 0.5, and rb near .01, but normalized so `sqrt(r1^2 + ra^2 + rb^2) == 1`. */
constexpr int num_rays = 6;
constexpr float r1 = 0.9987025295199663f;
constexpr float ra = 0.04993512647599832f;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index b86896b1a8e..c90572a68a6 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3928,9 +3928,11 @@ static void lib_link_all(FileData *fd, Main *bmain)
#endif
}
-/* Checks to perform after `lib_link_all`.
- * Those operations cannot perfom properly in a split bmain case, since some data from other
- * bmain's (aka libraries) may not have been processed yet. */
+/**
+ * Checks to perform after `lib_link_all`.
+ * Those operations cannot perform properly in a split bmain case, since some data from other
+ * bmain's (aka libraries) may not have been processed yet.
+ */
static void after_liblink_merged_bmain_process(Main *bmain)
{
/* We only expect a merged Main here, not a split one. */
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index e383d46858f..d8ab8d6f32a 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1657,7 +1657,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
if (!DNA_struct_elem_find(fd->filesdna, "Brush", "float", "falloff_angle")) {
for (Brush *br = bmain->brushes.first; br; br = br->id.next) {
br->falloff_angle = DEG2RADF(80);
- /* These flags are used for new feautres. They are not related to falloff_angle */
+ /* These flags are used for new features. They are not related to `falloff_angle`. */
br->flag &= ~(BRUSH_INVERT_TO_SCRAPE_FILL | BRUSH_ORIGINAL_PLANE |
BRUSH_GRAB_ACTIVE_VERTEX | BRUSH_SCENE_SPACING | BRUSH_FRONTFACE_FALLOFF);
}
diff --git a/source/blender/bmesh/intern/bmesh_error.h b/source/blender/bmesh/intern/bmesh_error.h
index fdec043ec48..41d02e334fb 100644
--- a/source/blender/bmesh/intern/bmesh_error.h
+++ b/source/blender/bmesh/intern/bmesh_error.h
@@ -25,7 +25,7 @@
/*----------- bmop error system ----------*/
/* pushes an error onto the bmesh error stack.
- * if msg is null, then the default message for the errorcode is used.*/
+ * if msg is null, then the default message for the `errcode` is used. */
void BMO_error_raise(BMesh *bm, BMOperator *owner, int errcode, const char *msg);
/* gets the topmost error from the stack.
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index 4c72b802396..8e5ed9c3bf0 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -802,7 +802,7 @@ void BM_edge_calc_rotate(BMEdge *e, const bool ccw, BMLoop **r_l1, BMLoop **r_l2
/* we know this will work */
BM_edge_face_pair(e, &fa, &fb);
- /* so we can use ccw variable correctly,
+ /* so we can use `ccw` variable correctly,
* otherwise we could use the edges verts direct */
BM_edge_ordered_verts(e, &v1, &v2);
@@ -886,7 +886,7 @@ bool BM_edge_rotate_check_degenerate(BMEdge *e, BMLoop *l1, BMLoop *l2)
/* verts from the loops passed */
BMVert *v1, *v2;
- /* these are the opposite verts - the verts that _would_ be used if 'ccw' was inverted*/
+ /* These are the opposite verts - the verts that _would_ be used if `ccw` was inverted. */
BMVert *v1_alt, *v2_alt;
/* this should have already run */
@@ -1070,7 +1070,7 @@ BMEdge *BM_edge_rotate(BMesh *bm, BMEdge *e, const bool ccw, const short check_f
BM_face_normal_flip(bm, fb);
if (ccw) {
- /* needed otherwise ccw toggles direction */
+ /* Needed otherwise `ccw` toggles direction */
e_new->l = e_new->l->radial_next;
}
}
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c
index a4e0d46e544..bccac006e8e 100644
--- a/source/blender/bmesh/intern/bmesh_opdefines.c
+++ b/source/blender/bmesh/intern/bmesh_opdefines.c
@@ -1394,7 +1394,7 @@ static BMOpDefine bmo_duplicate_def = {
/* slots_out */
{{"geom_orig.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT | BM_EDGE | BM_FACE}},
{"geom.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT | BM_EDGE | BM_FACE}},
- /* facemap maps from source faces to dupe
+ /* face_map maps from source faces to dupe
* faces, and from dupe faces to source faces */
{"vert_map.out", BMO_OP_SLOT_MAPPING, {(int)BMO_OP_SLOT_SUBTYPE_MAP_ELEM}},
{"edge_map.out", BMO_OP_SLOT_MAPPING, {(int)BMO_OP_SLOT_SUBTYPE_MAP_ELEM}},
diff --git a/source/blender/bmesh/intern/bmesh_structure.c b/source/blender/bmesh/intern/bmesh_structure.c
index cd230e76aca..cfdce0b749b 100644
--- a/source/blender/bmesh/intern/bmesh_structure.c
+++ b/source/blender/bmesh/intern/bmesh_structure.c
@@ -143,7 +143,7 @@ void bmesh_disk_vert_replace(BMEdge *e, BMVert *v_dst, BMVert *v_src)
*
* The loop cycle keeps track of a faces vertices and edges. It should be noted that the
* direction of a loop cycle is either CW or CCW depending on the face normal, and is
- * not oriented to the faces editedges.
+ * not oriented to the faces edit-edges.
*
* Functions relating to this cycle:
* - bmesh_cycle_XXX family of functions.
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 920307b42a2..0de909b5556 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -235,7 +235,7 @@ typedef struct BoundVert {
/** Is this boundvert the side of the custom profile's start. */
bool is_profile_start;
char _pad[3];
- /** Length of seam starting from current boundvert to next boundvert with ccw ordering. */
+ /** Length of seam starting from current boundvert to next boundvert with CCW ordering. */
int seam_len;
/** Same as seam_len but defines length of sharp edges. */
int sharp_len;
@@ -1961,7 +1961,7 @@ static bool make_unit_square_map(const float va[3],
/**
* Like make_unit_square_map, but this one makes a matrix that transforms the
* (1,1,1) corner of a unit cube into an arbitrary corner with corner vert d
- * and verts around it a, b, c (in ccw order, viewed from d normal dir).
+ * and verts around it a, b, c (in CCW order, viewed from d normal dir).
* The matrix mat is calculated to map:
* (1,0,0) -> va
* (0,1,0) -> vb
@@ -1969,9 +1969,9 @@ static bool make_unit_square_map(const float va[3],
* (1,1,1) -> vd
* We want M to make M*A=B where A has the left side above, as columns
* and B has the right side as columns - both extended into homogeneous coords.
- * So M = B*(Ainverse). Doing Ainverse by hand gives the code below.
- * The cols of M are 1/2{va-vb+vc-vd}, 1/2{-va+vb-vc+vd}, 1/2{-va-vb+vc+vd},
- * and 1/2{va+vb+vc-vd}
+ * So `M = B*(Ainverse)`. Doing `Ainverse` by hand gives the code below.
+ * The cols of M are `1/2{va-vb+vc-vd}`, `1/2{-va+vb-vc+vd}`, `1/2{-va-vb+vc+vd}`,
+ * and `1/2{va+vb+vc-vd}`
* and Blender matrices have cols at m[i][*].
*/
static void make_unit_cube_map(
@@ -6378,7 +6378,7 @@ static bool bev_rebuild_polygon(BMesh *bm, BevelParams *bp, BMFace *f)
go_ccw = (e->fnext != f);
}
else {
- go_ccw = true; /* Going ccw around bv to trace this corner. */
+ go_ccw = true; /* Going CCW around bv to trace this corner. */
}
}
else if (eprev->prev == e) {
@@ -7230,17 +7230,17 @@ static void set_profile_spacing(BevelParams *bp, ProfileSpacing *pro_spacing, bo
* B
* </pre>
*
- * 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;
+ * 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.
* 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
+ * 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 un-beveled.
- * Then it might collide with a. Similarly for B sliding along C.
+ * 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/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index fd40d38d238..fd31a11b0a8 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1706,7 +1706,7 @@ void DRW_draw_render_loop_offscreen(struct Depsgraph *depsgraph,
if (draw_background) {
/* HACK(fclem): In this case we need to make sure the final alpha is 1.
* We use the blend mode to ensure that. A better way to fix that would
- * be to do that in the colormanagmeent shader. */
+ * be to do that in the color-management shader. */
GPU_offscreen_bind(ofs, false);
GPU_clear_color(0.0f, 0.0f, 0.0f, 1.0f);
/* Premult Alpha over black background. */
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index a3052a919e7..eae16b2cb71 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -2744,7 +2744,7 @@ static int image_flip_exec(bContext *C, wmOperator *op)
ED_image_undo_push_end();
- /* force GPU reupload, all image is invalid. */
+ /* force GPU re-upload, all image is invalid. */
BKE_image_free_gputextures(ima);
WM_event_add_notifier(C, NC_IMAGE | NA_EDITED, ima);
diff --git a/source/blender/editors/space_info/info_draw.c b/source/blender/editors/space_info/info_draw.c
index f63a5530555..e3a82b8bd72 100644
--- a/source/blender/editors/space_info/info_draw.c
+++ b/source/blender/editors/space_info/info_draw.c
@@ -56,7 +56,7 @@ static enum eTextViewContext_LineFlag report_line_data(TextViewContext *tvc,
int shade = (tvc->iter_tmp % 2) ? 4 : -4;
UI_GetThemeColorShade4ubv(bg_id, shade, bg);
- /* Don't show icon on subsequent rows of multirow report. */
+ /* Don't show icon on subsequent rows of multi-row report. */
*r_icon = (tvc->iter_char_begin != 0) ? ICON_NONE : UI_icon_from_report_type(report->type);
int icon_fg_id = UI_text_colorid_from_report_type(report->type);
diff --git a/source/blender/editors/undo/memfile_undo.c b/source/blender/editors/undo/memfile_undo.c
index 51859b6a555..c0a1579b0fd 100644
--- a/source/blender/editors/undo/memfile_undo.c
+++ b/source/blender/editors/undo/memfile_undo.c
@@ -314,7 +314,7 @@ struct MemFile *ED_undosys_stack_memfile_get_active(UndoStack *ustack)
* If the last undo step is a memfile one, find the first #MemFileChunk matching given ID
* (using its session UUID), and tag it as "changed in the future".
*
- * Since non-memfile undos cannot automatically set this flag in the previous step as done with
+ * Since non-memfile undoes cannot automatically set this flag in the previous step as done with
* memfile ones, this has to be called manually by relevant undo code.
*
* \note Only current known case for this is undoing a switch from Object to Sculpt mode (see
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c
index c59fbbe1646..4f24975fafa 100644
--- a/source/blender/editors/util/ed_util.c
+++ b/source/blender/editors/util/ed_util.c
@@ -183,7 +183,7 @@ void ED_editors_exit(Main *bmain, bool do_undo_system)
return;
}
- /* frees all editmode undos */
+ /* Frees all edit-mode undoes. */
if (do_undo_system && G_MAIN->wm.first) {
wmWindowManager *wm = G_MAIN->wm.first;
/* normally we don't check for NULL undo stack,
diff --git a/source/blender/makesdna/DNA_ID_enums.h b/source/blender/makesdna/DNA_ID_enums.h
index c865c8ea973..04cbf51dd62 100644
--- a/source/blender/makesdna/DNA_ID_enums.h
+++ b/source/blender/makesdna/DNA_ID_enums.h
@@ -102,11 +102,11 @@ typedef enum ID_Type {
/* Deprecated. */
#define ID_SCRN MAKE_ID2('S', 'N')
-/* NOTE! Fake IDs, needed for g.sipo->blocktype or outliner */
+/* NOTE: Fake IDs, needed for `g.sipo->blocktype` or outliner. */
#define ID_SEQ MAKE_ID2('S', 'Q')
/* constraint */
#define ID_CO MAKE_ID2('C', 'O')
-/* pose (action channel, used to be ID_AC in code, so we keep code for backwards compat) */
+/* pose (action channel, used to be ID_AC in code, so we keep code for backwards compatible). */
#define ID_PO MAKE_ID2('A', 'C')
/* used in outliner... */
#define ID_NLA MAKE_ID2('N', 'L')
diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c
index cad0d77607b..b0a942cd39e 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -1471,8 +1471,8 @@ static int rna_property_override_diff_propptr(Main *bmain,
}
}
else {
- /* We could also use is_diff_pointer, but then we potentially lose the gt/lt info -
- * and don't think performances are critical here for now anyway... */
+ /* We could also use is_diff_pointer, but then we potentially lose the greater-than/less-than
+ * info - and don't think performances are critical here for now anyway. */
return !RNA_struct_equals(bmain, propptr_a, propptr_b, mode);
}
}
diff --git a/source/blender/render/intern/texture_image.c b/source/blender/render/intern/texture_image.c
index 5614318afbb..0299315beaf 100644
--- a/source/blender/render/intern/texture_image.c
+++ b/source/blender/render/intern/texture_image.c
@@ -630,7 +630,7 @@ static void boxsample(ImBuf *ibuf,
const short imapextend)
{
/* Sample box, performs clip. minx etc are in range 0.0 - 1.0 .
- * Enlarge with antialiased edges of pixels.
+ * Enlarge with anti-aliased edges of pixels.
* If variable 'imaprepeat' has been set, the
* clipped-away parts are sampled as well.
*/