diff options
Diffstat (limited to 'source/blender')
16 files changed, 24 insertions, 25 deletions
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_side_tag(const Scene *scene, break; } if (boundary_mode == UV_EDGE_LOOP_BOUNDARY_LOOP) { - /* Don't allow walking over the the face. */ + /* Don't allow walking over the face. */ if (f_step_prev == l_step->f) { break; } diff --git a/source/blender/makesdna/DNA_outliner_types.h b/source/blender/makesdna/DNA_outliner_types.h index 95d5a2ba73c..8a8a40a5069 100644 --- a/source/blender/makesdna/DNA_outliner_types.h +++ b/source/blender/makesdna/DNA_outliner_types.h @@ -35,11 +35,11 @@ typedef struct TreeStoreElem { short type, nr, flag, used; /* XXX We actually also store non-ID data in this pointer for identifying - * the TreeStoreElem for a TreeElement when rebuilding the tree. Ugly! */ + * the #TreeStoreElem for a #TreeElement when rebuilding the tree. Ugly! */ struct ID *id; } TreeStoreElem; -/* used only to store data in in blend files */ +/** Used only to store data in blend files. */ typedef struct TreeStore { /** Was previously used for memory preallocation. */ int totelem DNA_DEPRECATED; @@ -52,7 +52,7 @@ typedef struct TreeStore { TreeStoreElem *data; } TreeStore; -/* TreeStoreElem->flag */ +/** #TreeStoreElem.flag */ enum { TSE_CLOSED = (1 << 0), TSE_SELECTED = (1 << 1), @@ -71,7 +71,7 @@ enum { TSE_HIGHLIGHTED_ANY = (TSE_HIGHLIGHTED | TSE_HIGHLIGHTED_ICON), }; -/* TreeStoreElem->types */ +/** #TreeStoreElem.types */ #define TSE_NLA 1 /* NO ID */ #define TSE_NLA_ACTION 2 #define TSE_DEFGROUP_BASE 3 @@ -120,7 +120,7 @@ enum { #define TSE_LIBRARY_OVERRIDE_BASE 44 #define TSE_LIBRARY_OVERRIDE 45 -/* Check whether given TreeStoreElem should have a real ID in its ->id member. */ +/** Check whether given #TreeStoreElem should have a real ID in #TreeStoreElem.id member. */ #define TSE_IS_REAL_ID(_tse) \ (!ELEM((_tse)->type, \ TSE_NLA, \ diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index e00c5ba7f04..4dde1645ab7 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -125,7 +125,7 @@ typedef struct SDefBindPoly { float cent_edgemid_vecs_v2[2][2]; /** * The unsigned angle of this face-corner in `[0.0 .. PI]` range, - * where a small value is a thin corner. PI is is a straight line. + * where a small value is a thin corner. PI is a straight line. * Take care dividing by this value as it can approach zero. */ float edgemid_angle; diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h index 953722f28e9..dd2db209771 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h @@ -96,7 +96,7 @@ struct wmGizmoMap { /** Private, true when not yet used. */ bool is_init; - /** When set, one of of the items in 'groups' has #wmGizmoGroup.tag_remove set. */ + /** When set, one of the items in 'groups' has #wmGizmoGroup.tag_remove set. */ bool tag_remove_group; /** |