[Bf-blender-cvs] [c46663ad66c] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Tue Jul 21 08:03:19 CEST 2020
Commit: c46663ad66c6e378214f34db483ac67bb4c27272
Author: Campbell Barton
Date: Tue Jul 21 15:58:16 2020 +1000
Branches: master
https://developer.blender.org/rBc46663ad66c6e378214f34db483ac67bb4c27272
Cleanup: spelling
===================================================================
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/mask_rasterize.c
M source/blender/blenkernel/intern/tracking.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/editors/animation/fmodifier_ui.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/space_node/node_view.c
M source/blender/editors/transform/transform_convert_mesh_uv.c
M source/blender/freestyle/intern/image/Image.h
M source/blender/imbuf/intern/colormanagement.c
M source/blender/io/collada/AnimationImporter.cpp
M source/blender/makesrna/intern/rna_screen.c
===================================================================
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index e9e44ac05e5..d242337d5a7 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -4629,7 +4629,7 @@ void BKE_nurb_direction_switch(Nurb *nu)
bp1++;
bp2--;
}
- /* If there're odd number of points no need to touch coord of middle one,
+ /* If there are odd number of points no need to touch coord of middle one,
* but still need to change it's tilt.
*/
if (nu->pntsu & 1) {
diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c
index 7f98266becc..01d44d070b3 100644
--- a/source/blender/blenkernel/intern/mask_rasterize.c
+++ b/source/blender/blenkernel/intern/mask_rasterize.c
@@ -769,8 +769,8 @@ void BKE_maskrasterize_handle_init(MaskRasterHandle *mr_handle,
BLI_assert(tot_diff_feather_points == tot_diff_point);
- /* note: only added for convenience, we don't infact use these to scanfill,
- * only to create feather faces after scanfill */
+ /* Note: only added for convenience, we don't in fact use these to scan-fill,
+ * only to create feather faces after scan-fill. */
for (j = 0; j < tot_diff_feather_points; j++) {
copy_v2_v2(co_feather, diff_feather_points[j]);
sf_vert = BLI_scanfill_vert_add(&sf_ctx, co_feather);
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index 97d95cb7e46..f17467e4a26 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -509,7 +509,7 @@ void BKE_tracking_clipboard_copy_tracks(MovieTracking *tracking, MovieTrackingOb
}
}
-/* Check whether there're any tracks in the clipboard. */
+/* Check whether there are any tracks in the clipboard. */
bool BKE_tracking_clipboard_has_tracks(void)
{
return (BLI_listbase_is_empty(&tracking_clipboard.tracks) == false);
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index 2891279bb63..79f1aa1e640 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -4265,7 +4265,7 @@ void interp_weights_poly_v3(float *w, float v[][3], const int n, const float co[
* to borders of face.
* In that case, do simple linear interpolation between the two edge vertices */
- /* 'd_next.len' is infact 'd_curr.len', just avoid copy to begin with */
+ /* 'd_next.len' is in fact 'd_curr.len', just avoid copy to begin with */
if (UNLIKELY(d_next.len < eps)) {
ix_flag = IS_POINT_IX;
break;
@@ -4350,7 +4350,7 @@ void interp_weights_poly_v2(float *w, float v[][2], const int n, const float co[
* to borders of face. In that case,
* do simple linear interpolation between the two edge vertices */
- /* 'd_next.len' is infact 'd_curr.len', just avoid copy to begin with */
+ /* 'd_next.len' is in fact 'd_curr.len', just avoid copy to begin with */
if (UNLIKELY(d_next.len < eps)) {
ix_flag = IS_POINT_IX;
break;
diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c
index eadaa449b92..1ecdf5accb8 100644
--- a/source/blender/editors/animation/fmodifier_ui.c
+++ b/source/blender/editors/animation/fmodifier_ui.c
@@ -515,8 +515,7 @@ static void draw_modifier__cycles(uiLayout *layout,
RNA_pointer_create(fcurve_owner_id, &RNA_FModifierCycles, fcm, &ptr);
/* split into 2 columns
- * NOTE: the mode comboboxes shouldn't get labels, otherwise there isn't enough room
- */
+ * NOTE: the mode combination-boxes shouldn't get labels, otherwise there isn't enough room. */
split = uiLayoutSplit(layout, 0.5f, false);
/* before range */
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 988d19e30d3..88ad5d8fec1 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -1753,21 +1753,21 @@ static void ui_selectcontext_apply(bContext *C,
RNA_property_int_range(&but->rnapoin, prop, &min.i, &max.i);
}
else if (rna_type == PROP_ENUM) {
- /* not a delta infact */
+ /* Not a delta in fact. */
delta.i = RNA_property_enum_get(&but->rnapoin, prop);
}
else if (rna_type == PROP_BOOLEAN) {
if (is_array) {
- /* not a delta infact */
+ /* Not a delta in fact. */
delta.b = RNA_property_boolean_get_index(&but->rnapoin, prop, index);
}
else {
- /* not a delta infact */
+ /* Not a delta in fact. */
delta.b = RNA_property_boolean_get(&but->rnapoin, prop);
}
}
else if (rna_type == PROP_POINTER) {
- /* not a delta infact */
+ /* Not a delta in fact. */
delta.p = RNA_property_pointer_get(&but->rnapoin, prop);
}
diff --git a/source/blender/editors/space_node/node_view.c b/source/blender/editors/space_node/node_view.c
index b376c6b29cf..ce66740dc60 100644
--- a/source/blender/editors/space_node/node_view.c
+++ b/source/blender/editors/space_node/node_view.c
@@ -456,7 +456,7 @@ bool ED_space_node_color_sample(
if (ibuf->rect_float) {
fp = (ibuf->rect_float + (ibuf->channels) * (y * ibuf->x + x));
- /* IB_PROFILE_NONE is default but infact its linear */
+ /* #IB_PROFILE_NONE is default but in fact its linear. */
copy_v3_v3(r_col, fp);
ret = true;
}
diff --git a/source/blender/editors/transform/transform_convert_mesh_uv.c b/source/blender/editors/transform/transform_convert_mesh_uv.c
index f3e7446b2c4..632769c167e 100644
--- a/source/blender/editors/transform/transform_convert_mesh_uv.c
+++ b/source/blender/editors/transform/transform_convert_mesh_uv.c
@@ -92,7 +92,7 @@ static void UVsToTransData(const float aspect[2],
*/
static void uv_set_connectivity_distance(BMesh *bm, float *dists, const float aspect[2])
{
- /* Mostly copied from editmesh_set_connectivity_distance. */
+ /* Mostly copied from #editmesh_set_connectivity_distance. */
BLI_LINKSTACK_DECLARE(queue, BMLoop *);
/* Any BM_ELEM_TAG'd loop is added to 'queue_next', this makes sure that we don't add things
@@ -110,7 +110,7 @@ static void uv_set_connectivity_distance(BMesh *bm, float *dists, const float as
BM_mesh_elem_index_ensure(bm, BM_LOOP);
BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) {
- /* Visable faces was tagged in createTransUVs. */
+ /* Visible faces was tagged in #createTransUVs. */
if (!BM_elem_flag_test(f, BM_ELEM_TAG)) {
continue;
}
@@ -186,7 +186,7 @@ static void uv_set_connectivity_distance(BMesh *bm, float *dists, const float as
if (l_connected == l_other) {
continue;
}
- /* Visable faces was tagged in createTransUVs. */
+ /* Visible faces was tagged in #createTransUVs. */
if (!BM_elem_flag_test(l_connected->f, BM_ELEM_TAG)) {
continue;
}
@@ -233,7 +233,7 @@ static void uv_set_connectivity_distance(BMesh *bm, float *dists, const float as
#ifndef NDEBUG
/* Check that we didn't leave any loops tagged */
BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) {
- /* Visable faces was tagged in createTransUVs. */
+ /* Visible faces was tagged in #createTransUVs. */
if (!BM_elem_flag_test(f, BM_ELEM_TAG)) {
continue;
}
diff --git a/source/blender/freestyle/intern/image/Image.h b/source/blender/freestyle/intern/image/Image.h
index c42e47a670b..cf8b0e33c6b 100644
--- a/source/blender/freestyle/intern/image/Image.h
+++ b/source/blender/freestyle/intern/image/Image.h
@@ -394,7 +394,7 @@ class GrayImage : public FrsImage {
/*! Sets the array.
* copy
- * If true, the array is copie, otherwise the pounsigneder is copied
+ * If true, the array is copied, otherwise the pounsigneder is copied
*/
void setArray(float *lvl,
unsigned width,
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index 5c9ebbaba21..c9b3db39976 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -698,7 +698,7 @@ void colormanagement_init(void)
OCIO_configRelease(config);
}
- /* If there're no valid display/views, use fallback mode. */
+ /* If there are no valid display/views, use fallback mode. */
if (global_tot_display == 0 || global_tot_view == 0) {
printf("Color management: no displays/views in the config, using fallback mode instead\n");
diff --git a/source/blender/io/collada/AnimationImporter.cpp b/source/blender/io/collada/AnimationImporter.cpp
index 1e637f333e9..b53aa95a11f 100644
--- a/source/blender/io/collada/AnimationImporter.cpp
+++ b/source/blender/io/collada/AnimationImporter.cpp
@@ -306,7 +306,7 @@ bool AnimationImporter::write_animation(const COLLADAFW::Animation *anim)
animation_to_fcurves(curve);
break;
default:
- /* TODO there're also CARDINAL, HERMITE, BSPLINE and STEP types */
+ /* TODO there are also CARDINAL, HERMITE, BSPLINE and STEP types. */
fprintf(stderr,
"CARDINAL, HERMITE and BSPLINE anim interpolation types not supported yet.\n");
break;
diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c
index 2b65bf4922c..24c4818694f 100644
--- a/source/blender/makesrna/intern/rna_screen.c
+++ b/source/blender/makesrna/intern/rna_screen.c
@@ -367,7 +367,7 @@ static void rna_def_area(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_Area_type_update");
prop = RNA_def_property(srna, "ui_type", PROP_ENUM, PROP_NONE);
- RNA_def_property_enum_items(prop, DummyRNA_NULL_items); /* infact dummy */
+ RNA_def_property_enum_items(prop, DummyRNA_NULL_items); /* in fact dummy */
RNA_def_property_enum_default(prop, SPACE_VIEW3D << 16);
RNA_def_property_enum_funcs(
prop, "rna
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list