diff options
Diffstat (limited to 'source/blender/editors')
18 files changed, 27 insertions, 31 deletions
diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index badd7a4e3b6..aeead9350e9 100644 --- a/source/blender/editors/animation/keyframes_edit.c +++ b/source/blender/editors/animation/keyframes_edit.c @@ -251,7 +251,7 @@ static short ob_keyframes_loop(KeyframeEditData *ked, ANIM_animdata_freelist(&anim_data); - /* return return code - defaults to zero if nothing happened */ + /* Return the return code (defaults to zero if nothing happened). */ return ret; } @@ -300,7 +300,7 @@ static short scene_keyframes_loop(KeyframeEditData *ked, ANIM_animdata_freelist(&anim_data); - /* return return code - defaults to zero if nothing happened */ + /* Return the return code (defaults to zero if nothing happened). */ return ret; } diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c index 67d6dd94190..48b487c29fd 100644 --- a/source/blender/editors/armature/armature_edit.c +++ b/source/blender/editors/armature/armature_edit.c @@ -1107,7 +1107,7 @@ static int armature_align_bones_exec(bContext *C, wmOperator *op) } } - /* if there is only 1 selected bone, we assume that that is the active bone, + /* if there is only 1 selected bone, we assume that it is the active bone, * since a user will need to have clicked on a bone (thus selecting it) to make it active */ num_selected_bones = CTX_DATA_COUNT(C, selected_editable_bones); diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index 59780bf011e..c447138f00c 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -838,7 +838,7 @@ static int armature_parent_set_exec(bContext *C, wmOperator *op) } } - /* If there is only 1 selected bone, we assume that that is the active bone, + /* If there is only 1 selected bone, we assume that it is the active bone, * since a user will need to have clicked on a bone (thus selecting it) to make it active. */ bool is_active_only_selected = false; if (actbone->flag & BONE_SELECTED) { diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c index 47bb153cf46..e11ed927cbf 100644 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@ -2718,9 +2718,8 @@ static void gpencil_joined_fix_animdata_cb(ID *id, FCurve *fcu, void *user_data) fcu->rna_path = BKE_animsys_fix_rna_path_rename( id, fcu->rna_path, "layers", old_name, new_name, 0, 0, false); - /* we don't want to apply a second remapping on this F-Curve now, - * so stop trying to fix names names - */ + /* We don't want to apply a second remapping on this F-Curve now, + * so stop trying to fix names. */ break; } } diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 64883ed5f1d..98994feaf38 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -210,7 +210,7 @@ typedef enum { * \note Perspective views should enable #V3D_PROJ_TEST_CLIP_WIN along with * #V3D_PROJ_TEST_CLIP_NEAR as the near-plane-clipped location of a point * may become very large (even infinite) when projected into screen-space. - * Unless the that point happens to coincide with the camera's point of view. + * Unless that point happens to coincide with the camera's point of view. * * Use #V3D_PROJ_TEST_CLIP_CONTENT_DEFAULT instead of #V3D_PROJ_TEST_CLIP_CONTENT, * to avoid accidentally enabling near clipping without clipping by window bounds. diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index f255507ddaf..f4536d95dc5 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -5883,7 +5883,7 @@ static int ui_do_but_BLOCK(bContext *C, uiBut *but, uiHandleButtonData *data, co * wouldn't lead to cancel changes made to this button, but changing state to EXIT also * makes no button active for a while which leads to triggering operator when doing fast * scrolling mouse wheel. using post activate stuff from button allows to make button be - * active again after checking for all all that mouse leave and cancel stuff, so quick + * active again after checking for all that mouse leave and cancel stuff, so quick * scroll wouldn't be an issue anymore. Same goes for scrolling wheel in another * direction below (sergey). */ @@ -7992,8 +7992,7 @@ static void ui_blocks_set_tooltips(ARegion *region, const bool enable) return; } - /* we disabled buttons when when they were already shown, and - * re-enable them on mouse move */ + /* We disabled buttons when they were already shown, and re-enable them on mouse move. */ LISTBASE_FOREACH (uiBlock *, block, ®ion->uiblocks) { block->tooltipdisabled = !enable; } diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 122a43513b1..ab338a85e49 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -674,7 +674,7 @@ static void template_id_cb(bContext *C, void *arg_litem, void *arg_event) if (BKE_lib_id_make_local(bmain, id, false, 0)) { BKE_main_id_newptr_and_tag_clear(bmain); - /* reassign to get get proper updates/notifiers */ + /* Reassign to get proper updates/notifiers. */ idptr = RNA_property_pointer_get(&template_ui->ptr, template_ui->prop); undo_push_label = "Make Local"; } @@ -688,7 +688,7 @@ static void template_id_cb(bContext *C, void *arg_litem, void *arg_event) case UI_ID_OVERRIDE: if (id && ID_IS_OVERRIDE_LIBRARY(id)) { BKE_lib_override_library_free(&id->override_library, true); - /* reassign to get get proper updates/notifiers */ + /* Reassign to get proper updates/notifiers. */ idptr = RNA_property_pointer_get(&template_ui->ptr, template_ui->prop); RNA_property_pointer_set(&template_ui->ptr, template_ui->prop, idptr, NULL); RNA_property_update(C, &template_ui->ptr, template_ui->prop); diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 8badc05065d..91a4c430023 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -4956,7 +4956,7 @@ void ui_draw_menu_back(uiStyle *UNUSED(style), uiBlock *block, rcti *rect) } /** - * Uses the widget base drawing and colors from from the box widget, but ensures an opaque + * Uses the widget base drawing and colors from the box widget, but ensures an opaque * inner color. */ void ui_draw_box_opaque(rcti *rect, int roundboxalign) diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 3f2356fa774..91e25b5fc7f 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -2603,8 +2603,8 @@ static void object_data_convert_curve_to_mesh(Main *bmain, Depsgraph *depsgraph, /* Change objects which are using same curve. * A bit annoying, but: * - It's possible to have multiple curve objects selected which are sharing the same curve - * datablock. We don't want mesh to be created for every of those objects. - * - This is how conversion worked for a long long time. */ + * data-block. We don't want mesh to be created for every of those objects. + * - This is how conversion worked for a long time. */ LISTBASE_FOREACH (Object *, other_object, &bmain->objects) { if (other_object->data == curve) { other_object->type = OB_MESH; diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 88140460f5b..2437e0d1939 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -2602,8 +2602,8 @@ static void project_bucket_clip_face(const bool is_ortho, return; } - /* get the UV space bounding box */ - /* use IsectPT2Df_limit here so we catch points are are touching the tri edge + /* Get the UV space bounding box. */ + /* Use #IsectPT2Df_limit here so we catch points are touching the triangles edge * (or a small fraction over) */ bucket_bounds_ss[0][0] = bucket_bounds->xmax; bucket_bounds_ss[0][1] = bucket_bounds->ymin; diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index f5df60454eb..2f4e1c1abbe 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -1681,10 +1681,8 @@ static int mouse_graph_keys(bAnimContext *ac, /* deselect all other keyframes (+ F-Curves too) */ deselect_graph_keys(ac, 0, SELECT_SUBTRACT, true); - /* deselect other channels too, but only only do this if - * selection of channel when the visibility of keyframes - * doesn't depend on this - */ + /* Deselect other channels too, but only do this if selection of channel + * when the visibility of keyframes doesn't depend on this. */ if ((sipo->flag & SIPO_SELCUVERTSONLY) == 0) { ANIM_anim_channels_select_set(ac, ACHANNEL_SETFLAG_CLEAR); } diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index 50eb96824d7..9e0973f5fde 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -494,7 +494,7 @@ static bool format_stats( /* Create stats if they don't already exist. */ SceneStats **stats_p = (v3d_local) ? &v3d_local->runtime.local_stats : &view_layer->stats; if (*stats_p == NULL) { - /* Do not not access dependency graph if interface is marked as locked. */ + /* Don't access dependency graph if interface is marked as locked. */ wmWindowManager *wm = bmain->wm.first; if (wm->is_interface_locked) { return false; diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index c9f345b3123..6ce13f83cf3 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -1617,7 +1617,7 @@ static int view3d_context(const bContext *C, const char *member, bContextDataRes * This is ignored in the case the object is in any mode (besides object-mode), * since the object's mode impacts the current tool, cursor, gizmos etc. * If we didn't have this exception, changing visibility would need to perform - * many of the the same updates as changing the objects mode. + * many of the same updates as changing the objects mode. * * Further, there are multiple ways to hide objects - by collection, by object type, etc. * it's simplest if all these methods behave consistently - respecting the object-mode diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 91f3388cac9..c0a95f24f08 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -189,7 +189,7 @@ typedef struct FlyInfo { wmNDOFMotionData *ndof; #endif - /* fly state state */ + /* Fly state. */ /** The speed the view is moving per redraw. */ float speed; /** Axis index to move along by default Z to move along the view. */ @@ -758,7 +758,7 @@ static int flyApply(bContext *C, FlyInfo *fly, bool is_confirm) #define FLY_SMOOTH_FAC 20.0f /* higher value less lag */ /* fly mode - Shift+F - * a fly loop where the user can move move the view as if they are flying + * a fly loop where the user can move the view as if they are flying */ RegionView3D *rv3d = fly->rv3d; diff --git a/source/blender/editors/space_view3d/view3d_iterators.c b/source/blender/editors/space_view3d/view3d_iterators.c index 2a381bb96cb..c7a4030c402 100644 --- a/source/blender/editors/space_view3d/view3d_iterators.c +++ b/source/blender/editors/space_view3d/view3d_iterators.c @@ -242,7 +242,7 @@ typedef struct foreachScreenEdge_userData { rctf win_rect; /* copy of: vc.region->winx/winy, use for faster tests, minx/y will always be 0 */ /** - * Clip plans defined by the the view bounds, + * Clip plans defined by the view bounds, * use when #V3D_PROJ_TEST_CLIP_CONTENT is enabled. */ float content_planes[6][4]; diff --git a/source/blender/editors/space_view3d/view3d_placement.c b/source/blender/editors/space_view3d/view3d_placement.c index 2186cdb3162..1ea7993572d 100644 --- a/source/blender/editors/space_view3d/view3d_placement.c +++ b/source/blender/editors/space_view3d/view3d_placement.c @@ -1957,7 +1957,7 @@ struct PlacementCursor { /** * Enable this while the modal operator is running, - * so the preview-plane doesn't show at the same time time as add-object preview shape + * so the preview-plane doesn't show at the same time as add-object preview shape * since it's distracting & not helpful. */ bool do_draw; diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c index fd99619f9e2..84515d4a39b 100644 --- a/source/blender/editors/space_view3d/view3d_walk.c +++ b/source/blender/editors/space_view3d/view3d_walk.c @@ -234,7 +234,7 @@ typedef struct WalkInfo { wmNDOFMotionData *ndof; #endif - /* walk state state */ + /* Walk state. */ /** The base speed without run/slow down modifications. */ float base_speed; /** The speed the view is moving per redraw. */ diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 512f912a532..4212045a33d 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -1142,7 +1142,7 @@ static void raycast_obj_fn(SnapObjectContext *sctx, * \param r_loc: Hit location. * \param r_no: Hit normal (optional). * \param r_index: Hit index or -1 when no valid index is found. - * (currently only set to the polygon index when when using ``snap_to == SCE_SNAP_MODE_FACE``). + * (currently only set to the polygon index when using ``snap_to == SCE_SNAP_MODE_FACE``). * \param r_ob: Hit object. * \param r_obmat: Object matrix (may not be #Object.obmat with dupli-instances). * \param r_hit_list: List of #SnapObjectHitDepth (caller must free). @@ -2777,7 +2777,7 @@ static void snap_obj_fn(SnapObjectContext *sctx, * \param r_loc: Hit location. * \param r_no: Hit normal (optional). * \param r_index: Hit index or -1 when no valid index is found. - * (currently only set to the polygon index when when using ``snap_to == SCE_SNAP_MODE_FACE``). + * (currently only set to the polygon index when using ``snap_to == SCE_SNAP_MODE_FACE``). * \param r_ob: Hit object. * \param r_obmat: Object matrix (may not be #Object.obmat with dupli-instances). */ |