[Bf-blender-cvs] [eab9165c251] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Tue Feb 9 00:42:34 CET 2021
Commit: eab9165c2512581b918d8bfca40ec98ded08a84a
Author: Campbell Barton
Date: Tue Feb 9 10:42:00 2021 +1100
Branches: master
https://developer.blender.org/rBeab9165c2512581b918d8bfca40ec98ded08a84a
Cleanup: spelling
===================================================================
M source/blender/blenkernel/intern/brush.c
M source/blender/blenkernel/intern/paint.c
M source/blender/blenkernel/intern/undo_system.c
M source/blender/blenlib/intern/convexhull_2d.c
M source/blender/blenlib/intern/delaunay_2d.cc
M source/blender/blenlib/intern/mesh_boolean.cc
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/bmesh/intern/bmesh_error.h
M source/blender/bmesh/intern/bmesh_mods.c
M source/blender/bmesh/intern/bmesh_opdefines.c
M source/blender/bmesh/intern/bmesh_structure.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/draw/intern/draw_manager.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_info/info_draw.c
M source/blender/editors/undo/memfile_undo.c
M source/blender/editors/util/ed_util.c
M source/blender/makesdna/DNA_ID_enums.h
M source/blender/makesrna/intern/rna_rna.c
M source/blender/render/intern/texture_image.c
===================================================================
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 cd230e76a
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list