Commit: ace5677ef0db996a4236073d1e1d6895fd5cf4bd
Author: Campbell Barton
Date: Mon Nov 25 00:55:11 2019 +1100
Branches: master
https://developer.blender.org/rBace5677ef0db996a4236073d1e1d6895fd5cf4bd
Cleanup: spelling, repeated words
===================================================================
M intern/cycles/kernel/kernel_queues.h
M intern/cycles/render/light.h
M intern/ghost/intern/GHOST_EventButton.h
M intern/ghost/intern/GHOST_EventCursor.h
M intern/ghost/intern/GHOST_EventDragnDrop.h
M intern/libmv/libmv/autotrack/frame_accessor.h
M intern/utfconv/utfconv.h
M source/blender/blenkernel/BKE_blender_version.h
M source/blender/blenkernel/intern/curveprofile.c
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/subdiv_deform.c
M source/blender/blenkernel/intern/subdiv_mesh.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenloader/intern/versioning_cycles.c
M source/blender/bmesh/operators/bmo_subdivide_edgering.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/depsgraph/intern/depsgraph.cc
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
M source/blender/editors/mesh/editmesh_select.c
M source/blender/editors/object/object_add.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/space_view3d/view3d_fly.c
M source/blender/editors/space_view3d/view3d_walk.c
M source/blender/editors/transform/transform_generics.c
M source/blender/gpu/GPU_vertex_format.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/DNA_windowmanager_types.h
M source/blender/makesrna/intern/rna_scene.c
M source/blender/nodes/intern/node_common.c
===================================================================
diff --git a/intern/cycles/kernel/kernel_queues.h
b/intern/cycles/kernel/kernel_queues.h
index 91a39fc1465..451d2a0cedf 100644
--- a/intern/cycles/kernel/kernel_queues.h
+++ b/intern/cycles/kernel/kernel_queues.h
@@ -73,7 +73,7 @@ ccl_device void enqueue_ray_index_local(
int queue_number, /* Queue in which to enqueue ray index. */
char enqueue_flag, /* True for threads whose ray index has to be enqueued.
*/
int queuesize, /* queue size. */
- ccl_local_param unsigned int *local_queue_atomics, /* To to local queue
atomics. */
+ ccl_local_param unsigned int *local_queue_atomics, /* To do local queue
atomics. */
ccl_global int *Queue_data, /* Queues. */
ccl_global int *Queue_index) /* To do global queue
atomics. */
{
diff --git a/intern/cycles/render/light.h b/intern/cycles/render/light.h
index 6dd23374818..4f3048c1f32 100644
--- a/intern/cycles/render/light.h
+++ b/intern/cycles/render/light.h
@@ -79,7 +79,7 @@ class Light : public Node {
void tag_update(Scene *scene);
- /* Check whether the light has contribution the the scene. */
+ /* Check whether the light has contribution the scene. */
bool has_contribution(Scene *scene);
};
diff --git a/intern/ghost/intern/GHOST_EventButton.h
b/intern/ghost/intern/GHOST_EventButton.h
index e33a1c961bc..da1dc929f4f 100644
--- a/intern/ghost/intern/GHOST_EventButton.h
+++ b/intern/ghost/intern/GHOST_EventButton.h
@@ -37,7 +37,7 @@ class GHOST_EventButton : public GHOST_Event {
* \param time The time this event was generated.
* \param type The type of this event.
* \param window: The window of this event.
- * \param button: The state of the buttons were at at the time of the event.
+ * \param button: The state of the buttons were at the time of the event.
*/
GHOST_EventButton(GHOST_TUns64 time,
GHOST_TEventType type,
diff --git a/intern/ghost/intern/GHOST_EventCursor.h
b/intern/ghost/intern/GHOST_EventCursor.h
index 7947b134f4b..ac40f78569d 100644
--- a/intern/ghost/intern/GHOST_EventCursor.h
+++ b/intern/ghost/intern/GHOST_EventCursor.h
@@ -36,8 +36,8 @@ class GHOST_EventCursor : public GHOST_Event {
* Constructor.
* \param msec The time this event was generated.
* \param type The type of this event.
- * \param x The x-coordinate of the location the cursor was at at
the time of the event.
- * \param y The y-coordinate of the location the cursor was at at
the time of the event.
+ * \param x The x-coordinate of the location the cursor was at the
time of the event.
+ * \param y The y-coordinate of the location the cursor was at the
time of the event.
*/
GHOST_EventCursor(GHOST_TUns64 msec,
GHOST_TEventType type,
diff --git a/intern/ghost/intern/GHOST_EventDragnDrop.h
b/intern/ghost/intern/GHOST_EventDragnDrop.h
index 8e2a8d806ee..36291e8a254 100644
--- a/intern/ghost/intern/GHOST_EventDragnDrop.h
+++ b/intern/ghost/intern/GHOST_EventDragnDrop.h
@@ -69,8 +69,8 @@ class GHOST_EventDragnDrop : public GHOST_Event {
* \param type The type of this event.
* \param dataType The type of the drop candidate object
* \param window The window where the event occurred
- * \param x The x-coordinate of the location the cursor was at at
the time of the event.
- * \param y The y-coordinate of the location the cursor was at at
the time of the event.
+ * \param x The x-coordinate of the location the cursor was at the
time of the event.
+ * \param y The y-coordinate of the location the cursor was at the
time of the event.
* \param data The "content" dropped in the window
*/
GHOST_EventDragnDrop(GHOST_TUns64 time,
diff --git a/intern/libmv/libmv/autotrack/frame_accessor.h
b/intern/libmv/libmv/autotrack/frame_accessor.h
index 32f6349963c..cfad9ca71ff 100644
--- a/intern/libmv/libmv/autotrack/frame_accessor.h
+++ b/intern/libmv/libmv/autotrack/frame_accessor.h
@@ -83,7 +83,7 @@ struct FrameAccessor {
//
// Result is supposed to be a single channel image.
//
- // If region is NULL, it it assumed to be full-frame.
+ // If region is NULL, it assumed to be full-frame.
virtual Key GetMaskForTrack(int clip,
int frame,
int track,
diff --git a/intern/utfconv/utfconv.h b/intern/utfconv/utfconv.h
index 46c07500bf7..c291f1b4e1b 100644
--- a/intern/utfconv/utfconv.h
+++ b/intern/utfconv/utfconv.h
@@ -30,14 +30,14 @@ extern "C" {
#endif
/**
- * Counts how many bytes is requered for for future utf-8 string using utf-16
+ * Counts how many bytes is required for future utf-8 string using utf-16
* \param string16: pointer to working utf-16 string
* \return How many bytes must be allocated includeng NULL.
*/
size_t count_utf_8_from_16(const wchar_t *string16);
/**
- * Counts how many wchar_t (two byte) is requered for for future utf-16 string
using utf-8
+ * Counts how many wchar_t (two byte) is required for future utf-16 string
using utf-8
* \param string8: pointer to working utf-8 string
* \return How many bytes must be allocated includeng NULL.
*/
diff --git a/source/blender/blenkernel/BKE_blender_version.h
b/source/blender/blenkernel/BKE_blender_version.h
index dfa1b311eb0..dd1fff9ce47 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -37,7 +37,7 @@
#define BLENDER_VERSION_CHAR
/** alpha/beta/rc/release, docs use this. */
#define BLENDER_VERSION_CYCLE alpha
-/** Optionally set to 1,2,... for example to to get alpha1 or rc2. */
+/** Optionally set to 1,2,... for example to get alpha1 or rc2. */
#define BLENDER_VERSION_CYCLE_NUMBER
/** Defined in from blender.c */
diff --git a/source/blender/blenkernel/intern/curveprofile.c
b/source/blender/blenkernel/intern/curveprofile.c
index df877e78379..f07d29c0807 100644
--- a/source/blender/blenkernel/intern/curveprofile.c
+++ b/source/blender/blenkernel/intern/curveprofile.c
@@ -199,9 +199,11 @@ CurveProfilePoint *BKE_curveprofile_insert(CurveProfile
*profile, float x, float
return new_pt;
}
-/** Sets the handle type of the selected control points.
- * \param type_*: Either HD_VECT or HD_AUTO. Handle types for the first and
second handles.
- * \note: Requires curveprofile_update call after. */
+/**
+ * Sets the handle type of the selected control points.
+ * \param type_1, type_2: Either HD_VECT or HD_AUTO. Handle types for the
first and second handles.
+ * \note: Requires curveprofile_update call after.
+ */
void BKE_curveprofile_selected_handle_set(CurveProfile *profile, int type_1,
int type_2)
{
for (int i = 0; i < profile->path_len; i++) {
diff --git a/source/blender/blenkernel/intern/gpencil.c
b/source/blender/blenkernel/intern/gpencil.c
index 15532233a76..c51668ea68c 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -510,8 +510,8 @@ bGPDstroke *BKE_gpencil_add_stroke_existing_style(
bGPDframe *gpf, bGPDstroke *existing, int mat_idx, int totpoints, short
thickness)
{
bGPDstroke *gps = BKE_gpencil_add_stroke(gpf, mat_idx, totpoints, thickness);
- /* Copy runtime color data so that strokes added in the modifier has the
style.
- * There are depsgrapgh reference pointers inside,
+ /* Copy run-time color data so that strokes added in the modifier has the
style.
+ * There are depsgraph reference pointers inside,
* change the copy function if interfere with future drawing implementation.
*/
memcpy(&gps->runtime, &existing->runtime, sizeof(bGPDstroke_Runtime));
return gps;
diff --git a/source/blender/blenkernel/intern/particle.c
b/source/blender/blenkernel/intern/particle.c
index 74fbfc318a8..096142b9889 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -2965,7 +2965,7 @@ void psys_cache_paths(ParticleSimulationData *sim, float
cfra, const bool use_re
/*--get the first data points--*/
init_particle_interpolation(sim->ob, sim->psys, pa, &pind);
- /* hairmat is needed for for non-hair particle too so we get proper
rotations */
+ /* 'hairmat' is needed for non-hair particle too so we get proper
rotations. */
psys_mat_hair_to_global(sim->ob, psmd->mesh_final, psys->part->from, pa,
hairmat);
copy_v3_v3(rotmat[0], hairmat[2]);
copy_v3_v3(rotmat[1], hairmat[1]);
diff --git a/source/blender/blenkernel/intern/subdiv_deform.c
b/source/blender/blenkernel/intern/subdiv_deform.c
index 9c7949e7bdb..a686c44bf13 100644
--- a/source/blender/blenkernel/intern/subdiv_deform.c
+++ b/source/blender/blenkernel/intern/subdiv_deform.c
@@ -193,8 +193,7 @@ void BKE_subdiv_deform_coarse_vertices(struct Subdiv
*subdiv,
{
BKE_subdiv_stats_begin(&subdiv->stats, SUBDIV_STATS_SUBDIV_TO_MESH);
/* Make sure evaluator is up to date with possible new topology, and that
- * is is refined for the new positions of coarse vertices.
- */
+ * is refined for the new positions of coarse vertices. */
if (!BKE_subdiv_eval_update_from_mesh(subdiv, coarse_mesh, vertex_cos)) {
/* This could happen in two situations:
* - OpenSubdiv is disabled.
diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c
b/source/blender/blenkernel/intern/subdiv_mesh.c
index a30dde6284b..6c9cd72363a 100644
--- a/source/blender/blenkernel/intern/subdiv_mesh.c
+++ b/source/blender/blenkernel/intern/subdiv_mesh.c
@@ -1164,8 +1164,7 @@ Mesh *BKE_subdiv_to_mesh(Subdiv *subdiv,
{
BKE_subdiv_stats_begin(&subdiv->stats, SUBDIV_STATS_SUBDIV_TO_MESH);
/* Make sure evaluator is up to date with possible new topology, and that
- * is is refined for the new positions of coarse vertices.
- */
+ * it is refined for the new positions of coarse vertices. */
if (!BKE_subdiv_eval_update_from_mesh(subdiv, coarse_mesh, NULL)) {
/* This could happen in two situations:
* - OpenSubdiv is disabled.
diff --git a/source/blender/blenlib/intern/math_geom.c
b/source/blender/blenlib/intern/math_geom.c
index 6d8193e7675..67ef4d57b4b 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/sour
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
