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/blenkernel/intern/mesh_boolean_convert.cc11
-rw-r--r--source/blender/blenlib/intern/mesh_boolean.cc6
-rw-r--r--source/blender/draw/engines/workbench/workbench_effect_antialiasing.c2
-rw-r--r--source/blender/editors/space_file/space_file.c2
4 files changed, 13 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/mesh_boolean_convert.cc b/source/blender/blenkernel/intern/mesh_boolean_convert.cc
index 4b47294e61a..299b1ff1c71 100644
--- a/source/blender/blenkernel/intern/mesh_boolean_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_boolean_convert.cc
@@ -446,7 +446,8 @@ static void copy_edge_attributes(Mesh *dest_mesh,
}
}
-/* For Imesh face `f`, with corresponding output Mesh poly `mp`,
+/**
+ * For #IMesh face `f`, with corresponding output Mesh poly `mp`,
* where the original Mesh poly is `orig_mp`, coming from the Mesh
* `orig_me`, which has index `orig_me_index` in `mim`:
* fill in the `orig_loops` Array with corresponding indices of MLoops from `orig_me`
@@ -472,7 +473,7 @@ static int fill_orig_loops(const Face *f,
* that is the same as one in orig_me (after correcting for offset in mim meshes).
* Then see that loop and any subsequent ones have the same start and end vertex.
* This may miss some cases of partial alignment, but that's OK since discovering
- * aligned loops is only an optimization to avoid some reinterpolation.
+ * aligned loops is only an optimization to avoid some re-interpolation.
*/
int first_orig_v = f->vert[0]->orig;
if (first_orig_v == NO_INDEX) {
@@ -758,8 +759,10 @@ static Mesh *imesh_to_mesh(IMesh *im, MeshesToIMeshInfo &mim)
return result;
}
-/* Do Exact Boolean directly, without a round trip through BMesh.
- * The Mesh operands are in `meshes`, with corresponding transfprms in in `obmats`. */
+/**
+ * Do Exact Boolean directly, without a round trip through #BMesh.
+ * The Mesh operands are in `meshes`, with corresponding transforms in in `obmats`.
+ */
static Mesh *direct_mesh_boolean(const Mesh **meshes,
const float (*obmats[])[4][4],
const int meshes_len,
diff --git a/source/blender/blenlib/intern/mesh_boolean.cc b/source/blender/blenlib/intern/mesh_boolean.cc
index fffa37b935b..37205ecef41 100644
--- a/source/blender/blenlib/intern/mesh_boolean.cc
+++ b/source/blender/blenlib/intern/mesh_boolean.cc
@@ -2605,8 +2605,10 @@ static int find_cdt_edge(const CDT_result<mpq_class> &cdt_out, int v1, int v2)
return -1;
}
-/* Return the original edge id for the cdt output edge e_out, given that
- * the only input to CDT was face f. Pick the first, if there are several. */
+/**
+ * Return the original edge id for the CDT output edge e_out, given that
+ * the only input to CDT was face f. Pick the first, if there are several.
+ */
static int orig_edge_for_cdt_edge(const CDT_result<mpq_class> &cdt_out,
int cdt_e_out,
const Face *f)
diff --git a/source/blender/draw/engines/workbench/workbench_effect_antialiasing.c b/source/blender/draw/engines/workbench/workbench_effect_antialiasing.c
index 07121519ef4..10a782c9987 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_antialiasing.c
+++ b/source/blender/draw/engines/workbench/workbench_effect_antialiasing.c
@@ -70,7 +70,7 @@ static void workbench_taa_jitter_init_order(float (*table)[2], int num)
/* move jitter table so that closest sample is in center */
sub_v2_v2(table[index], closest_sample);
for (int i = 0; i < 2; i++) {
- /* Avoid samples outside range (wrap arround). */
+ /* Avoid samples outside range (wrap around). */
table[index][i] = fmodf(table[index][i] + 0.5f, 1.0f);
/* Recenter the distribution[-1..1]. */
table[index][i] = table[index][i] * 2.0f - 1.0f;
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c
index 66d24c7ab53..b175844a710 100644
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@ -558,7 +558,7 @@ static void file_main_region_draw(const bContext *C, ARegion *region)
v2d->keepofs |= V2D_LOCKOFS_Y;
/* XXX this happens on scaling down Screen (like from startup.blend) */
- /* view2d has no type specific for filewindow case, which doesn't scroll vertically */
+ /* view2d has no type specific for file-window case, which doesn't scroll vertically. */
if (v2d->cur.ymax < 0) {
v2d->cur.ymin -= v2d->cur.ymax;
v2d->cur.ymax = 0;