[Bf-blender-cvs] [6990b6ed3bd] master: Cleanup: typos (repeated words)
Campbell Barton
noreply at git.blender.org
Tue Jan 5 08:05:28 CET 2021
Commit: 6990b6ed3bdab971544a69c3950ac8897e62f41d
Author: Campbell Barton
Date: Tue Jan 5 13:38:48 2021 +1100
Branches: master
https://developer.blender.org/rB6990b6ed3bdab971544a69c3950ac8897e62f41d
Cleanup: typos (repeated words)
===================================================================
M source/blender/blenkernel/intern/collection.c
M source/blender/blenkernel/intern/mball_tessellate.c
M source/blender/bmesh/intern/bmesh_construct.c
M source/blender/draw/intern/draw_manager.c
M source/blender/editors/include/UI_interface.h
M source/blender/editors/mesh/editmesh_loopcut.c
M source/blender/editors/object/object_gpencil_modifier.c
M source/blender/editors/object/object_modifier.c
M source/blender/editors/object/object_shader_fx.c
M source/blender/editors/space_buttons/buttons_ops.c
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/uvedit/uvedit_select.c
M source/blender/makesdna/DNA_outliner_types.h
M source/blender/modifiers/intern/MOD_surfacedeform.c
M source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
===================================================================
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index b86b59066d6..a553552f099 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -1788,7 +1788,7 @@ static void layer_collection_flags_restore_recursive(LayerCollection *layer_coll
/* There should be a flag struct for every layer collection. */
BLI_assert(BLI_listbase_count(&layer_collection->layer_collections) ==
BLI_listbase_count(&flag->children));
- /* The flag and the the layer collection should actually correspond. */
+ /* The flag and the layer collection should actually correspond. */
BLI_assert(flag->collection == layer_collection->collection);
LayerCollectionFlag *child_flag = flag->children.first;
diff --git a/source/blender/blenkernel/intern/mball_tessellate.c b/source/blender/blenkernel/intern/mball_tessellate.c
index cb01927d992..051c7e56ef9 100644
--- a/source/blender/blenkernel/intern/mball_tessellate.c
+++ b/source/blender/blenkernel/intern/mball_tessellate.c
@@ -1199,7 +1199,7 @@ static void init_meta(Depsgraph *depsgraph, PROCESS *process, Scene *scene, Obje
zero_size = 0;
ml = NULL;
- /* If this metaball is the original that's used for duplication, only have it it visible when
+ /* If this metaball is the original that's used for duplication, only have it visible when
* the instancer is visible too. */
if ((base->flag_legacy & OB_FROMDUPLI) == 0 && ob->parent != NULL &&
(ob->parent->transflag & parenting_dupli_transflag) != 0 &&
diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c
index 8631c224ce0..3eab252df7a 100644
--- a/source/blender/bmesh/intern/bmesh_construct.c
+++ b/source/blender/bmesh/intern/bmesh_construct.c
@@ -613,7 +613,7 @@ void BM_mesh_copy_init_customdata(BMesh *bm_dst, BMesh *bm_src, const BMAllocTem
* \param bm_dst: BMesh whose custom-data layers will be added.
* \param bm_src: BMesh whose custom-data layers will be copied.
* \param htype: Specifies which custom-data layers will be initiated.
- * \param allocsize: Initialize the the memory-pool before use (may be an estimate).
+ * \param allocsize: Initialize the memory-pool before use (may be an estimate).
*/
void BM_mesh_copy_init_customdata_all_layers(BMesh *bm_dst,
BMesh *bm_src,
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index ffc565d0514..db701c384bd 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1761,8 +1761,7 @@ static void DRW_render_gpencil_to_image(RenderEngine *engine,
void DRW_render_gpencil(struct RenderEngine *engine, struct Depsgraph *depsgraph)
{
/* This function should only be called if there are are grease pencil objects,
- * especially important to avoid failing in in background renders without OpenGL
- * context. */
+ * especially important to avoid failing in background renders without OpenGL context. */
BLI_assert(DRW_render_check_grease_pencil(depsgraph));
Scene *scene = DEG_get_evaluated_scene(depsgraph);
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 05c3d6eff70..e83108b97ce 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -109,7 +109,7 @@ typedef enum eUIEmbossType {
UI_EMBOSS_PULLDOWN = 2, /* Pulldown menu style */
UI_EMBOSS_RADIAL = 3, /* Pie Menu */
/**
- * The same as #UI_EMBOSS_NONE, unless the the button has
+ * The same as #UI_EMBOSS_NONE, unless the button has
* a coloring status like an animation state or red alert.
*/
UI_EMBOSS_NONE_OR_STATUS = 4,
diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c
index 69d27cd5ffa..373d82883d1 100644
--- a/source/blender/editors/mesh/editmesh_loopcut.c
+++ b/source/blender/editors/mesh/editmesh_loopcut.c
@@ -222,7 +222,7 @@ static void ringsel_finish(bContext *C, wmOperator *op)
else if (is_macro && (cuts > 1) && (em->selectmode & SCE_SELECT_VERTEX)) {
EDBM_selectmode_disable(lcd->vc.scene, em, SCE_SELECT_VERTEX, SCE_SELECT_EDGE);
}
- /* force edge slide to edge select mode in in face select mode */
+ /* Force edge slide to edge select mode in face select mode. */
else if (EDBM_selectmode_disable(lcd->vc.scene, em, SCE_SELECT_FACE, SCE_SELECT_EDGE)) {
/* pass, the change will flush selection */
}
diff --git a/source/blender/editors/object/object_gpencil_modifier.c b/source/blender/editors/object/object_gpencil_modifier.c
index eb3ccf52c6f..f70e86bcb05 100644
--- a/source/blender/editors/object/object_gpencil_modifier.c
+++ b/source/blender/editors/object/object_gpencil_modifier.c
@@ -480,8 +480,8 @@ static void gpencil_edit_modifier_report_property(wmOperatorType *ot)
/**
* \param event: If this isn't NULL, the operator will also look for panels underneath
- * the cursor with customdata set to a modifier.
- * \param r_retval: This should be used if #event is used in order to to return
+ * the cursor with custom-data set to a modifier.
+ * \param r_retval: This should be used if #event is used in order to return
* #OPERATOR_PASS_THROUGH to check other operators with the same key set.
*/
static bool gpencil_edit_modifier_invoke_properties(bContext *C,
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index e9c84353b80..850e1382f47 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -1623,8 +1623,8 @@ static int modifier_set_active_exec(bContext *C, wmOperator *op)
* pointer then it would always set the active modifier to the already active modifier.
*
* \param event: If this isn't NULL, the operator will also look for panels underneath
- * the cursor with customdata set to a modifier.
- * \param r_retval: This should be used if #event is used in order to to return
+ * the cursor with custom-data set to a modifier.
+ * \param r_retval: This should be used if #event is used in order to return
* #OPERATOR_PASS_THROUGH to check other operators with the same key set.
*/
bool edit_modifier_invoke_properties_with_hover_no_active(bContext *C,
diff --git a/source/blender/editors/object/object_shader_fx.c b/source/blender/editors/object/object_shader_fx.c
index 2b1ac08ec2e..585a1e22a84 100644
--- a/source/blender/editors/object/object_shader_fx.c
+++ b/source/blender/editors/object/object_shader_fx.c
@@ -399,8 +399,8 @@ static void edit_shaderfx_report_property(wmOperatorType *ot)
/**
* \param event: If this isn't NULL, the operator will also look for panels underneath
- * the cursor with customdata set to a modifier.
- * \param r_retval: This should be used if #event is used in order to to return
+ * the cursor with custom-data set to a modifier.
+ * \param r_retval: This should be used if #event is used in order to return
* #OPERATOR_PASS_THROUGH to check other operators with the same key set.
*/
static bool edit_shaderfx_invoke_properties(bContext *C,
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c
index 23158c29aa1..f135c1ee726 100644
--- a/source/blender/editors/space_buttons/buttons_ops.c
+++ b/source/blender/editors/space_buttons/buttons_ops.c
@@ -127,7 +127,7 @@ static int toggle_pin_exec(bContext *C, wmOperator *UNUSED(op))
bScreen *screen = CTX_wm_screen(C);
RNA_pointer_create(&screen->id, &RNA_SpaceProperties, sbuts, &sbuts_ptr);
- /* Create the new ID pointer and set the the pin ID with RNA
+ /* Create the new ID pointer and set the pin ID with RNA
* so we can use the property's RNA update functionality. */
ID *new_id = (sbuts->flag & SB_PIN_CONTEXT) ? buttons_context_id_path(C) : NULL;
PointerRNA new_id_ptr;
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 8c6e4329577..3795f9a17d1 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1935,7 +1935,7 @@ static void outliner_mode_toggle_fn(bContext *C, void *tselem_poin, void *UNUSED
return;
}
- /* Check that the the item is actually an object. */
+ /* Check that the item is actually an object. */
BLI_assert(tselem->id != NULL && GS(tselem->id->name) == ID_OB);
Object *ob = (Object *)tselem->id;
@@ -1946,7 +1946,7 @@ static void outliner_mode_toggle_fn(bContext *C, void *tselem_poin, void *UNUSED
outliner_item_mode_toggle(C, &tvc, te, do_extend);
}
-/* Draw icons for adding and removing objects from the current interation mode. */
+/* Draw icons for adding and removing objects from the current interaction mode. */
static void outliner_draw_mode_column_toggle(uiBlock *block,
TreeViewContext *tvc,
TreeElement *te,
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 9f86e24ab68..35ec4de5077 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -1827,7 +1827,7 @@ static int mixed_bones_object_selectbuffer_extended(ViewContext *vc,
/**
* \param has_bones: When true, skip non-bone hits, also allow bases to be used
* that are visible but not select-able,
- * since you may be in pose mode with an an unselect-able object.
+ * since you may be in pose mode with an unselect-able object.
*
* \return the active base or NULL.
*/
diff --git a/source/blender/editors/uvedit/uvedit_select.c b/source/blender/editors/uvedit/uvedit_select.c
index a6b5aff4a44..499260127da 100644
--- a/source/blender/editors/uvedit/uvedit_select.c
+++ b/source/blender/editors/uvedit/uvedit_select.c
@@ -1154,7 +1154,7 @@ static void uv_select_edgeloop_single
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list