[Bf-blender-cvs] [1d8648b13a0] master: Cleanup: repeated terms in code comments & error messages
Campbell Barton
noreply at git.blender.org
Mon Jun 28 08:14:46 CEST 2021
Commit: 1d8648b13a0667d338a4e60df004be7e41525968
Author: Campbell Barton
Date: Mon Jun 28 15:44:12 2021 +1000
Branches: master
https://developer.blender.org/rB1d8648b13a0667d338a4e60df004be7e41525968
Cleanup: repeated terms in code comments & error messages
===================================================================
M intern/cycles/bvh/bvh_node.h
M intern/cycles/util/util_math_fast.h
M intern/cycles/util/util_task.h
M intern/ghost/intern/GHOST_SystemWin32.cpp
M intern/itasc/kdl/frames.inl
M intern/mantaflow/intern/manta_fluid_API.cpp
M source/blender/blenkernel/BKE_customdata.h
M source/blender/blenkernel/BKE_idtype.h
M source/blender/blenkernel/intern/action.c
M source/blender/blenkernel/intern/action_mirror.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/geometry_set_instances.cc
M source/blender/blenkernel/intern/gpencil_curve.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/mesh_boolean_convert.cc
M source/blender/blenkernel/intern/mesh_mapping.c
M source/blender/blenkernel/intern/mesh_mirror.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/unit.c
M source/blender/blenkernel/intern/volume.cc
M source/blender/blenkernel/nla_private.h
M source/blender/blenlib/BLI_vector.hh
M source/blender/blenlib/intern/BLI_kdopbvh.c
M source/blender/blenlib/intern/kdtree_impl.h
M source/blender/blenlib/intern/math_color.c
M source/blender/blenlib/intern/mesh_intersect.cc
M source/blender/blenlib/intern/stack.c
M source/blender/blenlib/intern/string.c
M source/blender/blenlib/tests/BLI_listbase_test.cc
M source/blender/blenloader/intern/readfile.c
M source/blender/bmesh/bmesh_class.h
M source/blender/bmesh/intern/bmesh_mesh_normals.c
M source/blender/bmesh/intern/bmesh_mods.c
M source/blender/bmesh/intern/bmesh_query.c
M source/blender/bmesh/operators/bmo_dupe.c
M source/blender/bmesh/operators/bmo_hull.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/compositor/intern/COM_CompositorContext.h
M source/blender/draw/intern/draw_manager.c
M source/blender/editors/animation/keyframes_edit.c
M source/blender/editors/armature/armature_edit.c
M source/blender/editors/armature/armature_relations.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/object/object_add.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/space_graph/graph_select.c
M source/blender/editors/space_info/info_stats.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_fly.c
M source/blender/editors/space_view3d/view3d_iterators.c
M source/blender/editors/space_view3d/view3d_placement.c
M source/blender/editors/space_view3d/view3d_walk.c
M source/blender/editors/transform/transform_snap_object.c
M source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp
M source/blender/freestyle/intern/winged_edge/WEdge.h
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
M source/blender/imbuf/intern/anim_movie.c
M source/blender/makesdna/DNA_genfile.h
M source/blender/makesrna/intern/rna_access_compare_override.c
M source/blender/makesrna/intern/rna_action.c
M source/blender/makesrna/intern/rna_fluid.c
M source/blender/makesrna/intern/rna_internal_types.h
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/nodes/NOD_derived_node_tree.hh
M source/blender/nodes/NOD_geometry_exec.hh
M source/blender/python/bmesh/bmesh_py_ops_call.c
M source/blender/python/bmesh/bmesh_py_types.c
M source/blender/python/generic/bgl.c
M source/blender/python/generic/idprop_py_api.c
M source/blender/python/generic/imbuf_py_api.c
M source/blender/render/intern/engine.c
M source/blender/sequencer/intern/render.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_stereo.c
===================================================================
diff --git a/intern/cycles/bvh/bvh_node.h b/intern/cycles/bvh/bvh_node.h
index 797dd5b694e..b3b5c43a394 100644
--- a/intern/cycles/bvh/bvh_node.h
+++ b/intern/cycles/bvh/bvh_node.h
@@ -179,7 +179,7 @@ class InnerNode : public BVHNode {
}
/* NOTE: This function is only used during binary BVH builder, and it
- * supposed to be configured to have 2 children which will be filled in in a
+ * supposed to be configured to have 2 children which will be filled-in in a
* bit. But this is important to have children reset to NULL. */
explicit InnerNode(const BoundBox &bounds) : BVHNode(bounds), num_children_(0)
{
diff --git a/intern/cycles/util/util_math_fast.h b/intern/cycles/util/util_math_fast.h
index 5ae56290f05..1113ede0f2d 100644
--- a/intern/cycles/util/util_math_fast.h
+++ b/intern/cycles/util/util_math_fast.h
@@ -243,7 +243,7 @@ ccl_device float fast_sinpif(float x)
const float P = 3.584135056f; /* P = 16-4*Q */
return y * (Q + P * fabsf(y));
- /* The original article used used inferior constants for Q and P and
+ /* The original article used inferior constants for Q and P and
* so had max error 1.091e-3.
*
* The optimal value for Q was determined by exhaustive search, minimizing
diff --git a/intern/cycles/util/util_task.h b/intern/cycles/util/util_task.h
index 55344ff86ba..ec45dfa8040 100644
--- a/intern/cycles/util/util_task.h
+++ b/intern/cycles/util/util_task.h
@@ -68,7 +68,7 @@ class TaskPool {
/* ** Statistics ** */
- /* Time time stamp of first task pushed. */
+ /* Time stamp of first task pushed. */
double start_time;
/* Number of all tasks pushed to the pool. Cleared after wait_work() and cancel(). */
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index cdfb950a72c..fd01d21da5a 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -1012,8 +1012,8 @@ void GHOST_SystemWin32::processWintabEvent(GHOST_WindowWin32 *window)
void GHOST_SystemWin32::processPointerEvent(
UINT type, GHOST_WindowWin32 *window, WPARAM wParam, LPARAM lParam, bool &eventHandled)
{
- /* Pointer events might fire when changing windows for a device which is set to use Wintab, even
- * when when Wintab is left enabled but set to the bottom of Wintab overlap order. */
+ /* Pointer events might fire when changing windows for a device which is set to use Wintab,
+ * even when Wintab is left enabled but set to the bottom of Wintab overlap order. */
if (!window->usingTabletAPI(GHOST_kTabletWinPointer)) {
return;
}
diff --git a/intern/itasc/kdl/frames.inl b/intern/itasc/kdl/frames.inl
index a09b532762b..f7a805d10c4 100644
--- a/intern/itasc/kdl/frames.inl
+++ b/intern/itasc/kdl/frames.inl
@@ -867,7 +867,7 @@ IMETHOD void Vector2::Set3DYZ(const Vector& v)
data[1]=v(2);
}
IMETHOD void Vector2::Set3DZX(const Vector& v)
-// projects v in its XY plane, and and sets *this to these values
+// projects v in its XY plane, and sets *this to these values
{
data[0]=v(2);
data[1]=v(0);
diff --git a/intern/mantaflow/intern/manta_fluid_API.cpp b/intern/mantaflow/intern/manta_fluid_API.cpp
index c04180c8c46..5b27bd91d91 100644
--- a/intern/mantaflow/intern/manta_fluid_API.cpp
+++ b/intern/mantaflow/intern/manta_fluid_API.cpp
@@ -323,7 +323,7 @@ static void get_rgba(
float *r, float *g, float *b, float *a, int total_cells, float *data, int sequential)
{
int i;
- /* Use offsets to map RGB grids to to correct location in data grid. */
+ /* Use offsets to map RGB grids to correct location in data grid. */
int m = 4, i_g = 1, i_b = 2, i_a = 3;
if (sequential) {
m = 1;
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index d41b3f9f956..c4db8ee925e 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -539,7 +539,7 @@ enum {
CDT_MIX_ADD = 17,
CDT_MIX_SUB = 18,
CDT_MIX_MUL = 19,
- /* etc. etc. */
+ /* Etc. */
};
typedef struct CustomDataTransferLayerMap {
diff --git a/source/blender/blenkernel/BKE_idtype.h b/source/blender/blenkernel/BKE_idtype.h
index 4578f1c3ca5..28171b2b363 100644
--- a/source/blender/blenkernel/BKE_idtype.h
+++ b/source/blender/blenkernel/BKE_idtype.h
@@ -82,8 +82,8 @@ typedef void (*IDTypeMakeLocalFunction)(struct Main *bmain, struct ID *id, const
typedef void (*IDTypeForeachIDFunction)(struct ID *id, struct LibraryForeachIDData *data);
typedef enum eIDTypeInfoCacheCallbackFlags {
- /** Indicates to the callback that that cache may be stored in the .blend file, so its pointer
- * should not be cleared at read-time. */
+ /** Indicates to the callback that cache may be stored in the .blend file,
+ * so its pointer should not be cleared at read-time. */
IDTYPE_CACHE_CB_FLAGS_PERSISTENT = 1 << 0,
} eIDTypeInfoCacheCallbackFlags;
typedef void (*IDTypeForeachCacheFunctionCallback)(struct ID *id,
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index cf7023bc672..fdf3558abed 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -486,8 +486,7 @@ void action_groups_add_channel(bAction *act, bActionGroup *agrp, FCurve *fcurve)
/* If grp is NULL, that means we fell through, and this F-Curve should be added as the new
* first since group is (effectively) the first group. Thus, the existing first F-Curve becomes
- * the second in the chain, etc. etc.
- */
+ * the second in the chain, etc. */
if (grp == NULL) {
BLI_insertlinkbefore(&act->curves, act->curves.first, fcurve);
}
diff --git a/source/blender/blenkernel/intern/action_mirror.c b/source/blender/blenkernel/intern/action_mirror.c
index c975d2bfb9c..69e0091444b 100644
--- a/source/blender/blenkernel/intern/action_mirror.c
+++ b/source/blender/blenkernel/intern/action_mirror.c
@@ -343,7 +343,7 @@ static void action_flip_pchan(Object *ob_arm,
} \
((void)0)
- /* Write the values back the the F-curves. */
+ /* Write the values back the F-curves. */
WRITE_ARRAY_FLT(loc);
WRITE_ARRAY_FLT(eul);
WRITE_ARRAY_FLT(quat);
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 462451fe72b..1849ca03b50 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -5135,7 +5135,7 @@ void BKE_curve_nurb_vert_active_set(Curve *cu, const Nurb *nu, const void *vert)
}
}
-/* Get points to active active nurb and active vert for curve */
+/* Get points to the active nurb and active vert for curve. */
bool BKE_curve_nurb_vert_active_get(Curve *cu, Nurb **r_nu, void **r_vert)
{
Nurb *nu = NULL;
diff --git a/source/blender/blenkernel/intern/geometry_set_instances.cc b/source/blender/blenkernel/intern/geometry_set_instances.cc
index 8cf08d05d9d..6921b102b20 100644
--- a/source/blender/blenkernel/intern/geometry_set_instances.cc
+++ b/source/blender/blenkernel/intern/geometry_set_instances.cc
@@ -264,7 +264,7 @@ static bool instances_attribute_foreach_recursive(const GeometrySet &geometry_se
}
}
- /* Now that this this geometry set is visited, increase the count and check with the limit. */
+ /* Now that this geometry set is visited, increase the count and check with the limit. */
if (limit > 0 && count++ > limit) {
return false;
}
diff --git a/source/blender/blenkernel/intern/gpencil_curve.c b/source/blender/blenkernel/intern/gpencil_curve.c
index 74bb787eac3..344be7bc0f5 100644
--- a/source/blender/blenkernel/intern/gpencil_curve.c
+++ b/source/blender/blenkernel/intern/gpencil_curve.c
@@ -242,8 +242,8 @@ static int gpencil_get_stroke_material_fromcurve(
float color_fill[4] = {0.0f, 0.0f, 0.0f, 0.0f};
/* If the curve has 2 materials, the first is considered as Fill and the second as Stroke.
- * If the has only one material, if the name contains _stroke, the is used
- * as stroke, else as fill. */
+ * If the has only one material, if the name contains "_stroke",
+ * it's used as a stroke, otherwise as fill. */
if (ob_cu->totcol >= 2) {
*do_stroke = true;
*do_fill = true;
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index a2131d735a6..740c9b3864c 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -1056,9 +1056,11 @@ Image *BKE_image_add_generated(Main *bmain,
return ima;
}
-/* Create an image image from ibuf. The refcount of ibuf is increased,
+/**
+ * Create an image from ibuf. The refcount of ibuf is increased,
* caller should take care to drop its reference by calling
- * IMB_freeImBuf if needed. */
+ * #IMB_freeImBuf if needed.
+ */
Image *BKE_image_add_from_imbuf(Main *bmain, ImBuf *ibuf, const char *name)
{
/* on save, type is changed to FILE in editsima.c */
diff --git a/source/blender/blenkernel/intern/mesh_boolean_convert.cc b/source/blender/blenkernel/intern/mesh_boolean_convert.cc
index 5a8921132af..c162458ffb9 100644
--- a/source/blender/blenkernel/intern/mesh_boolean_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_boolean_convert.cc
@@ -776,7 +776,7 @@ static Mesh *imesh_to_mesh(IMesh *im, MeshesToIMeshInfo &mim)
/**
* Do a mesh boolean operation directly on meshes (without going back and forth to BMesh).
- * \param meshes: An array of of Mesh pointers.
+ * \param meshes: An array of Mesh pointers.
* \param obmats: An array of pointers to the obmat matrices that transform local
* coordinates to global ones. It is allowed for the pointers to be null, meaning the
* transformation is the identity.
diff --git a/source/blender/blenkernel/intern/mesh_mapping.c b/source/blender/blenkernel/intern/mesh_mapping.c
index d4119f48193..c469a65449d 100644
--- a/source/blender/blenkernel/intern/mesh_mapping.c
+++ b/source/blender/blenkernel/intern/mesh_mapping.c
@@ -535,7 +535,7 @@ void BKE_mesh_edge_poly_map_create(MeshElemMap **r_map,
*
* This has the advantage that it can operate on any data-types.
*
- * \param totsource: The total number of element
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list