diff options
102 files changed, 200 insertions, 200 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 1dd8442b0df..1495ca50870 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -1111,7 +1111,7 @@ static bool acf_nla_controls_setting_valid(bAnimContext *UNUSED(ac), bAnimListEl case ACHANNEL_SETTING_EXPAND: return true; - // TOOD: selected? + // TODO: selected? default: /* unsupported */ return false; @@ -3035,7 +3035,7 @@ static int acf_gpl_setting_flag(bAnimContext *UNUSED(ac), eAnimChannel_Settings case ACHANNEL_SETTING_MUTE: /* animation muting - similar to frame lock... */ return GP_LAYER_FRAMELOCK; - case ACHANNEL_SETTING_VISIBLE: /* visiblity of the layers (NOT muting) */ + case ACHANNEL_SETTING_VISIBLE: /* visibility of the layers (NOT muting) */ *neg = true; return GP_LAYER_HIDE; diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 389a8d0fd03..26ef7f5ee73 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -2819,7 +2819,7 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index, agrp->flag ^= AGRP_SELECTED; } else if (selectmode == -1) { - /* select all in group (and deselect everthing else) */ + /* select all in group (and deselect everything else) */ FCurve *fcu; /* deselect all other channels */ diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 54590c5f66c..556e88cdf8f 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1529,7 +1529,7 @@ static size_t animfilter_nla_controls(ListBase *anim_data, bDopeSheet *ads, Anim items += tmp_items; } - /* return the numebr of items added to the list */ + /* return the number of items added to the list */ return items; } diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index e0f9a546dfc..a1e7df39014 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -636,7 +636,7 @@ static int ed_markers_opwrap_invoke(bContext *C, wmOperator *op, const wmEvent * /* ************************** add markers *************************** */ -/* add TimeMarker at curent frame */ +/* add TimeMarker at current frame */ static int ed_marker_add_exec(bContext *C, wmOperator *UNUSED(op)) { ListBase *markers = ED_context_get_markers(C); @@ -863,7 +863,7 @@ static int ed_marker_move_invoke_wrapper(bContext *C, wmOperator *op, const wmEv return ed_markers_opwrap_invoke_custom(C, op, event, ed_marker_move_invoke); } -/* note, init has to be called succesfully */ +/* note, init has to be called successfully */ static void ed_marker_move_apply(bContext *C, wmOperator *op) { #ifdef DURIAN_CAMERA_SWITCH diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index 1e5bc4f1cd0..541a282f389 100644 --- a/source/blender/editors/animation/keyframes_edit.c +++ b/source/blender/editors/animation/keyframes_edit.c @@ -107,7 +107,7 @@ short ANIM_fcurve_keyframes_loop(KeyframeEditData *ked, FCurve *fcu, KeyframeEdi ked->curflags = 0; } - /* Only operate on this BezTriple if it fullfills the criteria of the validation func */ + /* Only operate on this BezTriple if it fulfills the criteria of the validation func */ if ((ok = key_ok(ked, bezt))) { if (ked) ked->curflags = ok; @@ -759,7 +759,7 @@ static short snap_bezier_nearest(KeyframeEditData *UNUSED(ked), BezTriple *bezt) return 0; } -/* snaps the keyframe to the neares second */ +/* snaps the keyframe to the nearest second */ static short snap_bezier_nearestsec(KeyframeEditData *ked, BezTriple *bezt) { const Scene *scene = ked->scene; @@ -880,7 +880,7 @@ static short mirror_bezier_cframe(KeyframeEditData *ked, BezTriple *bezt) static short mirror_bezier_yaxis(KeyframeEditData *UNUSED(ked), BezTriple *bezt) { if (bezt->f2 & SELECT) { - /* Yes, names are inverted, we are mirroring accross y axis, hence along x axis... */ + /* Yes, names are inverted, we are mirroring across y axis, hence along x axis... */ mirror_bezier_xaxis_ex(bezt, 0.0f); } @@ -890,7 +890,7 @@ static short mirror_bezier_yaxis(KeyframeEditData *UNUSED(ked), BezTriple *bezt) static short mirror_bezier_xaxis(KeyframeEditData *UNUSED(ked), BezTriple *bezt) { if (bezt->f2 & SELECT) { - /* Yes, names are inverted, we are mirroring accross x axis, hence along y axis... */ + /* Yes, names are inverted, we are mirroring across x axis, hence along y axis... */ mirror_bezier_yaxis_ex(bezt, 0.0f); } @@ -909,7 +909,7 @@ static short mirror_bezier_marker(KeyframeEditData *ked, BezTriple *bezt) static short mirror_bezier_time(KeyframeEditData *ked, BezTriple *bezt) { - /* value to mirror over is strored in f1 */ + /* value to mirror over is stored in f1 */ if (bezt->f2 & SELECT) { mirror_bezier_xaxis_ex(bezt, ked->f1); } diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 7f045fa477f..bac4c4329cb 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -758,7 +758,7 @@ static bool visualkey_can_use(PointerRNA *ptr, PropertyRNA *prop) case CONSTRAINT_TYPE_KINEMATIC: return true; - /* single-transform constraits */ + /* single-transform constraints */ case CONSTRAINT_TYPE_TRACKTO: if (searchtype == VISUALKEY_ROT) return true; break; @@ -1710,7 +1710,7 @@ static int delete_key_v3d_exec(bContext *C, wmOperator *op) } /* special exception for bones, as this makes this operator more convenient to use - * NOTE: This is only done in pose mode. In object mode, we're dealign with the entire object. + * NOTE: This is only done in pose mode. In object mode, we're dealing with the entire object. */ if ((ob->mode & OB_MODE_POSE) && strstr(fcu->rna_path, "pose.bones[\"")) { bPoseChannel *pchan; diff --git a/source/blender/editors/armature/armature_add.c b/source/blender/editors/armature/armature_add.c index c1fb1dcf82f..cf0b2457eca 100644 --- a/source/blender/editors/armature/armature_add.c +++ b/source/blender/editors/armature/armature_add.c @@ -666,7 +666,7 @@ static int armature_symmetrize_exec(bContext *C, wmOperator *op) if (axis_delta == 0.0f) { /* both mirrored bones exist and point to eachother and overlap exactly. * - * in this case theres no well defined solution, so de-select both and skip. + * in this case there's no well defined solution, so de-select both and skip. */ ebone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL); ebone_iter->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL); diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c index ccc1eefd9dc..2550e1ff85e 100644 --- a/source/blender/editors/armature/armature_edit.c +++ b/source/blender/editors/armature/armature_edit.c @@ -243,7 +243,7 @@ float ED_armature_ebone_roll_to_vector(const EditBone *bone, const float align_a return roll; } -/* note, ranges arithmatic is used below */ +/* note, ranges arithmetic is used below */ typedef enum eCalcRollTypes { /* pos */ CALC_ROLL_POS_X = 0, @@ -969,7 +969,7 @@ static int armature_merge_exec(bContext *C, wmOperator *op) bstart = ebo; } else { - /* chain is broken... merge any continous segments then clear */ + /* chain is broken... merge any continuous segments then clear */ if (bstart && bend) bones_merge(obedit, bstart, bend, bchild, &chains); diff --git a/source/blender/editors/armature/armature_naming.c b/source/blender/editors/armature/armature_naming.c index 1fe5556952c..4440ccb3e42 100644 --- a/source/blender/editors/armature/armature_naming.c +++ b/source/blender/editors/armature/armature_naming.c @@ -139,7 +139,7 @@ static void constraint_bone_name_fix(Object *ob, ListBase *conlist, const char * /* called by UI for renaming a bone */ /* warning: make sure the original bone was not renamed yet! */ -/* seems messy, but thats what you get with not using pointers but channel names :) */ +/* seems messy, but that's what you get with not using pointers but channel names :) */ void ED_armature_bone_rename(Main *bmain, bArmature *arm, const char *oldnamep, const char *newnamep) { Object *ob; diff --git a/source/blender/editors/armature/pose_edit.c b/source/blender/editors/armature/pose_edit.c index 876159c6167..5e5988bd69b 100644 --- a/source/blender/editors/armature/pose_edit.c +++ b/source/blender/editors/armature/pose_edit.c @@ -195,7 +195,7 @@ static bool pose_has_protected_selected(Object *ob, short warn) */ void ED_pose_recalculate_paths(bContext *C, Scene *scene, Object *ob, bool current_frame_only) { - /* Transform doesn't always have context avaialble to do update. */ + /* Transform doesn't always have context available to do update. */ if (C == NULL) { return; } diff --git a/source/blender/editors/curve/editcurve_paint.c b/source/blender/editors/curve/editcurve_paint.c index ad128b91c5a..ceebcf79650 100644 --- a/source/blender/editors/curve/editcurve_paint.c +++ b/source/blender/editors/curve/editcurve_paint.c @@ -107,7 +107,7 @@ struct CurveDrawData { bool use_plane; float plane[4]; - /* use 'rv3d->depths', note that this will become 'damaged' while drawing, but thats OK. */ + /* use 'rv3d->depths', note that this will become 'damaged' while drawing, but that's OK. */ bool use_depth; /* offset projection by this value */ diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c index 1cff5b82484..0646d689812 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c @@ -852,7 +852,7 @@ static int gizmo_cage2d_modal( if (event->type != MOUSEMOVE) { return OPERATOR_RUNNING_MODAL; } - /* For transform logic to be managable we operate in -0.5..0.5 2D space, + /* For transform logic to be manageable we operate in -0.5..0.5 2D space, * no matter the size of the rectangle, mouse coorts are scaled to unit space. * The mouse coords have been projected into the matrix so we don't need to worry about axis alignment. * diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c index 3b74311b800..3bbe13362d0 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c @@ -480,7 +480,7 @@ static int gizmo_cage3d_modal( if (event->type != MOUSEMOVE) { return OPERATOR_RUNNING_MODAL; } - /* For transform logic to be managable we operate in -0.5..0.5 2D space, + /* For transform logic to be manageable we operate in -0.5..0.5 2D space, * no matter the size of the rectangle, mouse coorts are scaled to unit space. * The mouse coords have been projected into the matrix so we don't need to worry about axis alignment. * diff --git a/source/blender/editors/gpencil/gpencil_add_monkey.c b/source/blender/editors/gpencil/gpencil_add_monkey.c index 7f5c51633b2..048e933db9a 100644 --- a/source/blender/editors/gpencil/gpencil_add_monkey.c +++ b/source/blender/editors/gpencil/gpencil_add_monkey.c @@ -1447,7 +1447,7 @@ void ED_gpencil_create_monkey(bContext *C, float mat[4][4]) bGPDlayer *Lines = BKE_gpencil_layer_addnew(gpd, "Lines", true); /* frames */ - /* NOTE: No need to check for existing, as this will tkae care of it for us */ + /* NOTE: No need to check for existing, as this will take care of it for us */ bGPDframe *frameColor = BKE_gpencil_frame_addnew(Colors, cfra_eval); bGPDframe *frameLines = BKE_gpencil_frame_addnew(Lines, cfra_eval); diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c index 67fc9774d26..216e65b9d9f 100644 --- a/source/blender/editors/gpencil/gpencil_brush.c +++ b/source/blender/editors/gpencil/gpencil_brush.c @@ -1141,7 +1141,7 @@ static bool gpsculpt_brush_apply_clone(bContext *C, tGP_BrushEditData *gso) gp_brush_clone_add(C, gso); } else { - /* Stamp or Continous Mode */ + /* Stamp or Continuous Mode */ if (1 /*gso->brush->mode == GP_EDITBRUSH_CLONE_MODE_STAMP*/) { /* Stamp - Proceed to translate the newly added strokes */ gp_brush_clone_adjust(gso); diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c index 7932f6308a6..99f5967274a 100644 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@ -1408,7 +1408,7 @@ static int gp_stroke_change_color_exec(bContext *C, wmOperator *op) if (ED_gpencil_stroke_color_use(ob, gpl, gps) == false) continue; - /* asign new color */ + /* assign new color */ gps->mat_nr = idx; } } diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index c6d470fd6a2..923bd1e9f18 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -3044,7 +3044,7 @@ static int gp_stroke_subdivide_exec(bContext *C, wmOperator *op) temp_dverts = MEM_dupallocN(gps->dvert); } - /* resize the points arrys */ + /* resize the points arrays */ gps->totpoints += totnewpoints; gps->points = MEM_recallocN(gps->points, sizeof(*gps->points) * gps->totpoints); if (gps->dvert != NULL) { @@ -3202,7 +3202,7 @@ void GPENCIL_OT_stroke_simplify(wmOperatorType *ot) RNA_def_property_flag(prop, PROP_SKIP_SAVE); } -/* ** simplify stroke using fixed algorith *** */ +/* ** simplify stroke using fixed algorithm *** */ static int gp_stroke_simplify_fixed_exec(bContext *C, wmOperator *op) { bGPdata *gpd = ED_gpencil_data_get_active(C); diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c index 825731623ee..3fd26f77449 100644 --- a/source/blender/editors/gpencil/gpencil_fill.c +++ b/source/blender/editors/gpencil/gpencil_fill.c @@ -394,7 +394,7 @@ static void set_pixel(ImBuf *ibuf, int idx, const float col[4]) * * \param ibuf Image pixel data * \param maxpixel Maximum index - * \param limit Limit of pixels to analize + * \param limit Limit of pixels to analyze * \param index Index of current pixel * \param type 0-Horizontal 1-Vertical */ diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 1f3230e44fe..7b2a106b5cc 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1771,7 +1771,7 @@ static void gp_init_drawing_brush(bContext *C, tGPsdata *p) curvemapping_initialize(brush->gpencil_settings->curve_strength); curvemapping_initialize(brush->gpencil_settings->curve_jitter); - /* asign to temp tGPsdata */ + /* assign to temp tGPsdata */ p->brush = brush; if (brush->gpencil_settings->brush_type != GP_BRUSH_TYPE_ERASE) { p->eraser = gp_get_default_eraser(p->bmain, ts); diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index 570825d0106..43166ca17d7 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -544,7 +544,7 @@ static void gpencil_primitive_done(bContext *C, wmOperator *op, wmWindow *win, t /* insert keyframes as required... */ gpf = BKE_gpencil_layer_getframe(tgpi->gpl, tgpi->cframe, GP_GETFRAME_ADD_NEW); - /* prepare stroke to get transfered */ + /* prepare stroke to get transferred */ gps = tgpi->gpf->strokes.first; if (gps) { gps->thickness = tgpi->brush->size; diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index c0aea452385..9072a18eb88 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -944,7 +944,7 @@ void gp_subdivide_stroke(bGPDstroke *gps, const int subdivide) temp_points = MEM_dupallocN(gps->points); oldtotpoints = gps->totpoints; - /* resize the points arrys */ + /* resize the points arrays */ gps->totpoints += totnewpoints; gps->points = MEM_recallocN(gps->points, sizeof(*gps->points) * gps->totpoints); if (gps->dvert != NULL) { diff --git a/source/blender/editors/include/ED_types.h b/source/blender/editors/include/ED_types.h index a478278da4c..9188fca2422 100644 --- a/source/blender/editors/include/ED_types.h +++ b/source/blender/editors/include/ED_types.h @@ -33,7 +33,7 @@ /* **************** GENERAL EDITOR-WIDE TYPES AND DEFINES ************************** */ -/* old blender defines... should be depricated? */ +/* old blender defines... should be deprecated? */ #define DESELECT 0 #define SELECT 1 #define ACTIVE 2 diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 923cda42a59..13d1c2b8916 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -195,7 +195,7 @@ enum { UI_BUT_TEXTEDIT_UPDATE = (1 << 29), /* when widget is in textedit mode, update value on each char stroke */ UI_BUT_VALUE_CLEAR = (1 << 30), /* show 'x' icon to clear/unlink value of text or search button */ - UI_BUT_OVERRIDEN = (1 << 31), /* RNA property of the button is overriden from linked reference data. */ + UI_BUT_OVERRIDEN = (1 << 31), /* RNA property of the button is overridden from linked reference data. */ }; #define UI_PANEL_WIDTH 340 diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 362f9ef2fda..312d41b796d 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -4240,7 +4240,7 @@ void UI_but_drag_set_value(uiBut *but) void UI_but_drag_set_image(uiBut *but, const char *path, int icon, struct ImBuf *imb, float scale, const bool use_free) { but->dragtype = WM_DRAG_PATH; - ui_def_but_icon(but, icon, 0); /* no flag UI_HAS_ICON, so icon doesnt draw in button */ + ui_def_but_icon(but, icon, 0); /* no flag UI_HAS_ICON, so icon doesn't draw in button */ if ((but->dragflag & UI_BUT_DRAGPOIN_FREE)) { MEM_SAFE_FREE(but->dragpoin); but->dragflag &= ~UI_BUT_DRAGPOIN_FREE; diff --git a/source/blender/editors/interface/interface_eyedropper_color.c b/source/blender/editors/interface/interface_eyedropper_color.c index bcce70d9d8a..8e80d5657d7 100644 --- a/source/blender/editors/interface/interface_eyedropper_color.c +++ b/source/blender/editors/interface/interface_eyedropper_color.c @@ -103,7 +103,7 @@ static bool eyedropper_init(bContext *C, wmOperator *op) display_device = scene->display_settings.display_device; eye->display = IMB_colormanagement_display_get_named(display_device); - /* store inital color */ + /* store initial color */ RNA_property_float_get_array(&eye->ptr, eye->prop, col); if (eye->display) { IMB_colormanagement_display_to_scene_linear_v3(col, eye->display); diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index a0126b0c069..94c9ecb7e38 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -155,7 +155,7 @@ typedef enum uiHandleButtonState { #ifdef USE_ALLSELECT -/* Unfortunately theres no good way handle more generally: +/* Unfortunately there's no good way handle more generally: * (propagate single clicks on layer buttons to other objects) */ #define USE_ALLSELECT_LAYER_HACK @@ -2321,7 +2321,7 @@ static void ui_but_copy_paste(bContext *C, uiBut *but, uiHandleButtonData *data, * It converts every UTF-8 character to an asterisk, and also remaps * the cursor position and selection start/end. * - * \note: remaping is used, because password could contain UTF-8 characters. + * \note: remapping is used, because password could contain UTF-8 characters. * */ @@ -2585,7 +2585,7 @@ static bool ui_textedit_insert_buf( if ((len + step >= data->maxlen) && (data->maxlen - (len + 1) > 0)) { if (ui_but_is_utf8(but)) { - /* shorten 'step' to a utf8 algined size that fits */ + /* shorten 'step' to a utf8 aligned size that fits */ BLI_strnlen_utf8_ex(buf, data->maxlen - (len + 1), &step); } else { @@ -3665,7 +3665,7 @@ static int ui_do_but_HOTKEYEVT( if (event->type == LEFTMOUSE && event->val == KM_PRESS) { /* only cancel if click outside the button */ if (ui_but_contains_point_px(but->active->region, but, event->x, event->y) == 0) { - /* data->cancel doesnt work, this button opens immediate */ + /* data->cancel doesn't work, this button opens immediate */ if (but->flag & UI_BUT_IMMEDIATE) ui_but_value_set(but, 0); else @@ -4329,7 +4329,7 @@ static int ui_do_but_NUM( else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) { if (data->dragchange) { #ifdef USE_DRAG_MULTINUM - /* if we started multibutton but didnt drag, then edit */ + /* if we started multibutton but didn't drag, then edit */ if (data->multi_data.init == BUTTON_MULTI_INIT_SETUP) { click = 1; } @@ -4637,7 +4637,7 @@ static int ui_do_but_SLI( else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) { if (data->dragchange) { #ifdef USE_DRAG_MULTINUM - /* if we started multibutton but didnt drag, then edit */ + /* if we started multibutton but didn't drag, then edit */ if (data->multi_data.init == BUTTON_MULTI_INIT_SETUP) { click = 1; } @@ -7914,7 +7914,7 @@ static int ui_handle_button_event(bContext *C, const wmEvent *event, uiBut *but) case MOUSEMOVE: { /* deselect the button when moving the mouse away */ - /* also de-activate for buttons that only show higlights */ + /* also de-activate for buttons that only show highlights */ if (ui_but_contains_point_px(ar, but, event->x, event->y)) { /* Drag on a hold button (used in the toolbar) now opens it immediately. */ @@ -8237,7 +8237,7 @@ static void ui_handle_button_return_submenu(bContext *C, const wmEvent *event, u /* ************************* menu handling *******************************/ /** - * Function used to prevent loosing the open menu when using nested pulldowns, + * Function used to prevent losing the open menu when using nested pulldowns, * when moving mouse towards the pulldown menu over other buttons that could * steal the highlight from the current button, only checks: * @@ -8460,7 +8460,7 @@ static int ui_menu_scroll(ARegion *ar, uiBlock *block, int my, uiBut *to_bt) * let the parent menu get the event. * * This allows a menu to be open, - * but send key events to the parent if theres no active buttons. + * but send key events to the parent if there's no active buttons. * * Without this keyboard navigation from menu's wont work. */ @@ -8601,7 +8601,7 @@ static int ui_handle_menu_event( if (but && button_modal_state(but->active->state)) { if (block->flag & (UI_BLOCK_MOVEMOUSE_QUIT | UI_BLOCK_POPOVER)) { /* if a button is activated modal, always reset the start mouse - * position of the towards mechanism to avoid loosing focus, + * position of the towards mechanism to avoid losing focus, * and don't handle events */ ui_mouse_motion_towards_reinit(menu, &event->x); } diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 28627c3d44e..8612a14c308 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1220,7 +1220,7 @@ void uiItemsFullEnumO_items( uiItemS(target); } else { - /* XXX bug here, colums draw bottom item badly */ + /* XXX bug here, columns draw bottom item badly */ uiItemS(target); } } @@ -3070,7 +3070,7 @@ static void ui_litem_layout_column_flow(uiLayout *litem) /* multi-column and multi-row layout. */ typedef struct UILayoutGridFlowInput { - /* General layout controll settings. */ + /* General layout control settings. */ const bool row_major : 1; /* Fill rows before columns */ const bool even_columns : 1; /* All columns will have same width. */ const bool even_rows : 1; /* All rows will have same height. */ @@ -3278,7 +3278,7 @@ static void ui_litem_estimate_grid_flow(uiLayout *litem) /* Even in varying column width case, we fix our columns number from weighted average width of items, * a proper solving of required width would be too costly, and this should give reasonably good results - * in all resonable cases... */ + * in all reasonable cases... */ if (gflow->columns_len > 0) { gflow->tot_columns = gflow->columns_len; } @@ -3301,7 +3301,7 @@ static void ui_litem_estimate_grid_flow(uiLayout *litem) const int step = modulo ? modulo : 1; if (gflow->row_major) { - /* Adjust number of columns to be mutiple of given modulo. */ + /* Adjust number of columns to be multiple of given modulo. */ if (modulo && gflow->tot_columns % modulo != 0 && gflow->tot_columns > modulo) { gflow->tot_columns = gflow->tot_columns - (gflow->tot_columns % modulo); } @@ -3312,7 +3312,7 @@ static void ui_litem_estimate_grid_flow(uiLayout *litem) gflow->tot_columns -= step); } else { - /* Adjust number of rows to be mutiple of given modulo. */ + /* Adjust number of rows to be multiple of given modulo. */ if (modulo && gflow->tot_rows % modulo != 0) { gflow->tot_rows = min_ii(gflow->tot_rows + modulo - (gflow->tot_rows % modulo), gflow->tot_items); } diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index 15ecbc1b03e..d35a66639bf 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -955,7 +955,7 @@ static void align_sub_panels(Panel *pa) } } -/* this doesnt draw */ +/* this doesn't draw */ /* returns 1 when it did something */ static bool uiAlignPanelStep(ScrArea *sa, ARegion *ar, const float fac, const bool drag) { @@ -1425,7 +1425,7 @@ static void ui_panel_drag_collapse(bContext *C, uiPanelDragCollapseHandle *dragc /** * Panel drag-collapse (modal handler) * Clicking and dragging over panels toggles their collapse state based on the panel that was first - * dragged over. If it was open all affected panels incl the initial one are closed and vise versa. + * dragged over. If it was open all affected panels incl the initial one are closed and vice versa. */ static int ui_panel_drag_collapse_handler(bContext *C, const wmEvent *event, void *userdata) { @@ -1849,7 +1849,7 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active) const int px_x_sign = is_left ? px : -px; const int category_tabs_width = round_fl_to_int(UI_PANEL_CATEGORY_MARGIN_WIDTH * zoom); const float dpi_fac = UI_DPI_FAC; - const int tab_v_pad_text = round_fl_to_int((2 + ((px * 3) * dpi_fac)) * zoom); /* pading of tabs around text */ + const int tab_v_pad_text = round_fl_to_int((2 + ((px * 3) * dpi_fac)) * zoom); /* padding of tabs around text */ const int tab_v_pad = round_fl_to_int((4 + (2 * px * dpi_fac)) * zoom); /* padding between tabs */ const float tab_curve_radius = ((px * 3) * dpi_fac) * zoom; /* We flip the tab drawing, so always use these flags. */ diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 90b230ab2b0..78322e1e1bc 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1572,7 +1572,7 @@ uiLayout *uiTemplateModifier(uiLayout *layout, bContext *C, PointerRNA *ptr) /* find modifier and draw it */ cageIndex = modifiers_getCageIndex(scene, ob, &lastCageIndex, 0); - /* XXX virtual modifiers are not accesible for python */ + /* XXX virtual modifiers are not accessible for python */ vmd = modifiers_getVirtualModifierList(ob, &virtualModifierData); for (i = 0; vmd; i++, vmd = vmd->next) { @@ -2792,7 +2792,7 @@ static uiBlock *curvemap_clipping_func(bContext *C, ARegion *ar, void *cumap_v) block = UI_block_begin(C, ar, __func__, UI_EMBOSS); - /* use this for a fake extra empy space around the buttons */ + /* use this for a fake extra empty space around the buttons */ uiDefBut(block, UI_BTYPE_LABEL, 0, "", -4, 16, width + 8, 6 * UI_UNIT_Y, NULL, 0, 0, 0, 0, ""); bt = uiDefButBitI( diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c index 60aa79e1093..507f89f01cd 100644 --- a/source/blender/editors/interface/interface_utils.c +++ b/source/blender/editors/interface/interface_utils.c @@ -120,7 +120,7 @@ uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int ind but = uiDefButR_prop(block, UI_BTYPE_TEXT, 0, name, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL); if (RNA_property_flag(prop) & PROP_TEXTEDIT_UPDATE) { - /* TEXTEDIT_UPDATE is usally used for search buttons. For these we also want + /* TEXTEDIT_UPDATE is usually used for search buttons. For these we also want * the 'x' icon to clear search string, so setting VALUE_CLEAR flag, too. */ UI_but_flag_enable(but, UI_BUT_TEXTEDIT_UPDATE | UI_BUT_VALUE_CLEAR); } diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 4ad3a54feba..9654f088637 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -484,7 +484,7 @@ static void ui_view2d_curRect_validate_resize(View2D *v2d, bool resize, bool mas float curRatio, winRatio; /* when a window edge changes, the aspect ratio can't be used to - * find which is the best new 'cur' rect. thats why it stores 'old' + * find which is the best new 'cur' rect. that's why it stores 'old' */ if (winx != v2d->oldwinx) do_x = true; if (winy != v2d->oldwiny) do_y = true; @@ -1189,7 +1189,7 @@ static void step_to_grid(float *step, int *power, int unit) /* for frames, we want 1.0 frame intervals only */ if (unit == V2D_UNIT_FRAMES) { rem = 1.0f; - *step = 2.0f; /* use 2 since there are grid lines drawn in between, this way to get 1 line per frane */ + *step = 2.0f; /* use 2 since there are grid lines drawn in between, this way to get 1 line per frame */ } /* prevents printing 1.0 2.0 3.0 etc */ diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c index 7aedd776b5d..aaa46847495 100644 --- a/source/blender/editors/mesh/editmesh_bisect.c +++ b/source/blender/editors/mesh/editmesh_bisect.c @@ -288,7 +288,7 @@ static int mesh_bisect_exec(bContext *C, wmOperator *op) /* -------------------------------------------------------------------- */ /* Modal support */ - /* Note: keep this isolated, exec can work wihout this */ + /* Note: keep this isolated, exec can work without this */ if (opdata != NULL) { mesh_bisect_interactive_calc(C, op, plane_co, plane_no); /* Write back to the props. */ diff --git a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c index 79dd055b2fd..0f3046f19cb 100644 --- a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c +++ b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c @@ -1031,7 +1031,7 @@ static void gizmo_mesh_spin_redo_draw_prepare( ggd->data.op = WM_operator_last_redo((bContext *)ggd->data.context); } - /* Not essentual, just avoids feedback loop where matrices could shift because of float precision. + /* Not essential, just avoids feedback loop where matrices could shift because of float precision. * Updates in this case are also redundant. */ bool is_modal = false; for (wmGizmo *gz = gzgroup->gizmos.first; gz; gz = gz->next) { diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c index 9af700aa6bf..044e1b8c9d0 100644 --- a/source/blender/editors/mesh/editmesh_intersect.c +++ b/source/blender/editors/mesh/editmesh_intersect.c @@ -707,7 +707,7 @@ static int edbm_face_split_by_edges_exec(bContext *C, wmOperator *UNUSED(op)) } } - /* edge index is set to -1 then used to assosiate them with faces */ + /* edge index is set to -1 then used to associate them with faces */ BM_ITER_MESH(e, &iter, bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e, BM_ELEM_SELECT) && BM_edge_is_wire(e)) { BM_elem_flag_enable(e, hflag); diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index e2f13139718..e48fb6d9ecb 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -482,7 +482,7 @@ static KnifeEdge *get_bm_knife_edge(KnifeTool_OpData *kcd, BMEdge *e) /* Record the index in kcd->em->looptris of first looptri triple for a given face, * given an index for some triple in that array. * This assumes that all of the triangles for a given face are contiguous - * in that array (as they are by the current tesselation routines). + * in that array (as they are by the current tessellation routines). * Actually store index + 1 in the hash, because 0 looks like "no entry" * to hash lookup routine; will reverse this in the get routine. * Doing this lazily rather than all at once for all faces. @@ -1250,7 +1250,7 @@ static bool knife_ray_intersect_face( lv2 = kcd->cagecos[BM_elem_index_get(tri[1]->v)]; lv3 = kcd->cagecos[BM_elem_index_get(tri[2]->v)]; /* using epsilon test in case ray is directly through an internal - * tesselation edge and might not hit either tesselation tri with + * tessellation edge and might not hit either tessellation tri with * an exact test; * we will exclude hits near real edges by a later test */ if (isect_ray_tri_epsilon_v3(v1, raydir, lv1, lv2, lv3, &lambda, ray_tri_uv, KNIFE_FLT_EPS)) { @@ -2220,7 +2220,7 @@ static int knife_update_active(KnifeTool_OpData *kcd) /* if no hits are found this would normally default to (0, 0, 0) so instead * get a point at the mouse ray closest to the previous point. * Note that drawing lines in `free-space` isn't properly supported - * but theres no guarantee (0, 0, 0) has any geometry either - campbell */ + * but there's no guarantee (0, 0, 0) has any geometry either - campbell */ if (kcd->curr.vert == NULL && kcd->curr.edge == NULL && kcd->curr.bmface == NULL) { float origin[3]; float origin_ofs[3]; diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 794111fd6ae..9d6c0267cc2 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -1016,7 +1016,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, const wmEvent *event) bool no_vertex_selected = true; bool error_face_selected = true; - bool error_disconected_vertices = true; + bool error_disconnected_vertices = true; bool error_rip_failed = true; for (uint ob_index = 0; ob_index < objects_len; ob_index++) { @@ -1047,7 +1047,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, const wmEvent *event) if ((bm->totvertsel > 1) && (bm->totedgesel == 0)) { continue; } - error_disconected_vertices = false; + error_disconnected_vertices = false; /* note on selection: * When calling edge split we operate on tagged edges rather then selected @@ -1096,7 +1096,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, const wmEvent *event) BKE_report(op->reports, RPT_ERROR, "Cannot rip selected faces"); return OPERATOR_CANCELLED; } - else if (error_disconected_vertices) { + else if (error_disconnected_vertices) { BKE_report(op->reports, RPT_ERROR, "Cannot rip multiple disconnected vertices"); return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index ca1581f33fb..8be1ee911dd 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -1910,7 +1910,7 @@ static int edbm_edge_rotate_selected_exec(bContext *C, wmOperator *op) BMO_slot_buffer_hflag_disable(em->bm, bmop.slots_in, "edges", BM_EDGE, BM_ELEM_SELECT, true); BMO_op_exec(em->bm, &bmop); - /* edges may rotate into hidden vertices, if this does _not_ run we get an ilogical state */ + /* edges may rotate into hidden vertices, if this does _not_ run we get an illogical state */ BMO_slot_buffer_hflag_disable(em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_HIDDEN, true); BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_SELECT, true); @@ -2938,7 +2938,7 @@ static int edbm_remove_doubles_exec(bContext *C, wmOperator *op) BMOperator bmop; const int totvert_orig = em->bm->totvert; - /* avoid loosing selection state (select -> tags) */ + /* avoid losing selection state (select -> tags) */ char htype_select; if (em->selectmode & SCE_SELECT_VERTEX) htype_select = BM_VERT; else if (em->selectmode & SCE_SELECT_EDGE) htype_select = BM_EDGE; @@ -3416,7 +3416,7 @@ static float bm_edge_seg_isect( b2 = ((x22 * y21) - (x21 * y22)) / xdiff2; } else { - m2 = MAXSLOPE; /* Verticle slope */ + m2 = MAXSLOPE; /* Vertical slope */ b2 = x22; } diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index d5b83b71bc3..37f5aa806de 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -438,14 +438,14 @@ void EDBM_selectmode_flush(BMEditMesh *em) void EDBM_deselect_flush(BMEditMesh *em) { - /* function below doesnt use. just do this to keep the values in sync */ + /* function below doesn't use. just do this to keep the values in sync */ em->bm->selectmode = em->selectmode; BM_mesh_deselect_flush(em->bm); } void EDBM_select_flush(BMEditMesh *em) { - /* function below doesnt use. just do this to keep the values in sync */ + /* function below doesn't use. just do this to keep the values in sync */ em->bm->selectmode = em->selectmode; BM_mesh_select_flush(em->bm); } diff --git a/source/blender/editors/mesh/mesh_mirror.c b/source/blender/editors/mesh/mesh_mirror.c index 4b526915551..f37ad9a7439 100644 --- a/source/blender/editors/mesh/mesh_mirror.c +++ b/source/blender/editors/mesh/mesh_mirror.c @@ -267,7 +267,7 @@ void ED_mesh_mirrtopo_init( /* sort so we can count unique values */ qsort(topo_hash_prev, totvert, sizeof(MirrTopoHash_t), mirrtopo_hash_sort); - tot_unique = 1; /* account for skiping the first value */ + tot_unique = 1; /* account for skipping the first value */ for (a = 1; a < totvert; a++) { if (topo_hash_prev[a - 1] != topo_hash_prev[a]) { tot_unique++; diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index ae5a6912673..c6f9c1230a6 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1631,7 +1631,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base, * still work out ok */ BKE_object_apply_mat4(ob_dst, dob->mat, false, true); - /* to set ob_dst->orig and in case theres any other discrepicies */ + /* to set ob_dst->orig and in case there's any other discrepancies */ DEG_id_tag_update(&ob_dst->id, OB_RECALC_OB); } } @@ -1790,7 +1790,7 @@ static int convert_exec(bContext *C, wmOperator *op) { ob->flag &= ~OB_DONE; - /* flag data thats not been edited (only needed for !keep_original) */ + /* flag data that's not been edited (only needed for !keep_original) */ if (ob->data) { ((ID *)ob->data)->tag |= LIB_TAG_DOIT; } @@ -1819,7 +1819,7 @@ static int convert_exec(bContext *C, wmOperator *op) Base *base = link->ptr.data; Object *ob = base->object; - /* The way object type conversion works currently (enforcing conversion of *all* objetcs using converted + /* The way object type conversion works currently (enforcing conversion of *all* objects using converted * obdata, even some un-selected/hidden/inother scene ones, sounds totally bad to me. * However, changing this is more design than bugfix, not to mention convoluted code below, * so that will be for later. @@ -1909,7 +1909,7 @@ static int convert_exec(bContext *C, wmOperator *op) /* make new mesh data from the original copy */ /* note: get the mesh from the original, not from the copy in some - * cases this doesnt give correct results (when MDEF is used for eg) + * cases this doesn't give correct results (when MDEF is used for eg) */ dm = mesh_get_derived_final(depsgraph, scene, newob, CD_MASK_MESH); diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index d2a85de8fe1..fdb267c796e 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -501,7 +501,7 @@ static int constraint_type_get(Object *owner, bPoseChannel *pchan) } /* checks validity of object pointers, and NULLs, - * if Bone doesnt exist it sets the CONSTRAINT_DISABLE flag. + * if Bone doesn't exist it sets the CONSTRAINT_DISABLE flag. */ static void test_constraints(Main *bmain, Object *owner, bPoseChannel *pchan) { @@ -599,7 +599,7 @@ static bool edit_constraint_poll_generic(bContext *C, StructRNA *rna_type) } if (ID_IS_STATIC_OVERRIDE(ob)) { - CTX_wm_operator_poll_msg_set(C, "Cannot edit constraints comming from static override"); + CTX_wm_operator_poll_msg_set(C, "Cannot edit constraints coming from static override"); return (((bConstraint *)ptr.data)->flag & CONSTRAINT_STATICOVERRIDE_LOCAL) != 0; } @@ -1764,7 +1764,7 @@ static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase return OPERATOR_CANCELLED; } - /* create a new constraint of the type requried, and add it to the active/given constraints list */ + /* create a new constraint of the type required, and add it to the active/given constraints list */ if (pchan) con = BKE_constraint_add_for_pose(ob, pchan, NULL, type); else @@ -1999,7 +1999,7 @@ static int pose_ik_add_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED return OPERATOR_CANCELLED; } - /* prepare popup menu to choose targetting options */ + /* prepare popup menu to choose targeting options */ pup = UI_popup_menu_begin(C, IFACE_("Add IK"), ICON_NONE); layout = UI_popup_menu_layout(pup); @@ -2066,7 +2066,7 @@ static int pose_ik_clear_exec(bContext *C, wmOperator *UNUSED(op)) { bConstraint *con, *next; - /* TODO: should we be checking if these contraints were local before we try and remove them? */ + /* TODO: should we be checking if these constraints were local before we try and remove them? */ for (con = pchan->constraints.first; con; con = next) { next = con->next; if (con->type == CONSTRAINT_TYPE_KINEMATIC) { diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 43d287590e6..c893f106363 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1225,7 +1225,7 @@ void OBJECT_OT_forcefield_toggle(wmOperatorType *ot) */ void ED_objects_recalculate_paths(bContext *C, Scene *scene, bool current_frame_only) { - /* Transform doesn't always have context avaialble to do update. */ + /* Transform doesn't always have context available to do update. */ if (C == NULL) { return; } diff --git a/source/blender/editors/object/object_gpencil_modifier.c b/source/blender/editors/object/object_gpencil_modifier.c index e8b5bebef0d..cb46185a087 100644 --- a/source/blender/editors/object/object_gpencil_modifier.c +++ b/source/blender/editors/object/object_gpencil_modifier.c @@ -379,7 +379,7 @@ static int gpencil_edit_modifier_poll_generic(bContext *C, StructRNA *rna_type, if (ptr.id.data && ID_IS_LINKED(ptr.id.data)) return 0; if (ID_IS_STATIC_OVERRIDE(ob)) { - CTX_wm_operator_poll_msg_set(C, "Cannot edit modifiers comming from static override"); + CTX_wm_operator_poll_msg_set(C, "Cannot edit modifiers coming from static override"); return (((GpencilModifierData *)ptr.data)->flag & eGpencilModifierFlag_StaticOverride_Local) != 0; } diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 4b155642b0e..cfd50b0dba6 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -833,7 +833,7 @@ bool edit_modifier_poll_generic(bContext *C, StructRNA *rna_type, int obtype_fla if (ptr.id.data && ID_IS_LINKED(ptr.id.data)) return 0; if (ID_IS_STATIC_OVERRIDE(ob)) { - CTX_wm_operator_poll_msg_set(C, "Cannot edit modifiers comming from static override"); + CTX_wm_operator_poll_msg_set(C, "Cannot edit modifiers coming from static override"); return (((ModifierData *)ptr.data)->flag & eModifierFlag_StaticOverride_Local) != 0; } diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 7934bcf2d15..5d9b6a2d13e 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2329,7 +2329,7 @@ static int make_override_static_exec(bContext *C, wmOperator *op) success = BKE_override_static_create_from_tag(bmain); - /* Intantiate our newly overridden objects in scene, if not yet done. */ + /* Instantiate our newly overridden objects in scene, if not yet done. */ Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); Collection *new_collection = (Collection *)collection->id.newid; @@ -2363,7 +2363,7 @@ static int make_override_static_exec(bContext *C, wmOperator *op) /* obcollection is no more duplicollection-ing, it merely parents whole collection of overriding instantiated objects. */ obcollection->dup_group = NULL; - /* Also, we'd likely want to lock by default things like transformations of implicitly overriden objects? */ + /* Also, we'd likely want to lock by default things like transformations of implicitly overridden objects? */ DEG_id_tag_update(&scene->id, 0); @@ -2383,7 +2383,7 @@ static int make_override_static_exec(bContext *C, wmOperator *op) success = BKE_override_static_create_from_tag(bmain); - /* Also, we'd likely want to lock by default things like transformations of implicitly overriden objects? */ + /* Also, we'd likely want to lock by default things like transformations of implicitly overridden objects? */ /* Cleanup. */ BKE_main_id_clear_newpoins(bmain); diff --git a/source/blender/editors/object/object_shader_fx.c b/source/blender/editors/object/object_shader_fx.c index 62569676434..47cf9f6c20b 100644 --- a/source/blender/editors/object/object_shader_fx.c +++ b/source/blender/editors/object/object_shader_fx.c @@ -301,7 +301,7 @@ static bool edit_shaderfx_poll_generic(bContext *C, StructRNA *rna_type, int obt if (ptr.id.data && ID_IS_LINKED(ptr.id.data)) return 0; if (ID_IS_STATIC_OVERRIDE(ob)) { - CTX_wm_operator_poll_msg_set(C, "Cannot edit shaderfxs comming from static override"); + CTX_wm_operator_poll_msg_set(C, "Cannot edit shaderfxs coming from static override"); return (((ShaderFxData *)ptr.data)->flag & eShaderFxFlag_StaticOverride_Local) != 0; } diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 13166929090..81e074a7e8f 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -494,7 +494,7 @@ static void mesh_defvert_mirror_update_internal( const int def_nr) { if (def_nr == -1) { - /* all vgroups, add groups where neded */ + /* all vgroups, add groups where needed */ int flip_map_len; int *flip_map = defgroup_flip_map(ob, &flip_map_len, true); defvert_sync_mapped(dvert_dst, dvert_src, flip_map, flip_map_len, true); diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 361eb031ea6..bb69c40e932 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -1311,7 +1311,7 @@ void recalc_emitter_field(Depsgraph *UNUSED(depsgraph), Object *UNUSED(ob), Part BLI_kdtree_free(edit->emitter_field); totface = mesh->totface; - /*totvert=dm->getNumVerts(dm);*/ /*UNSUED*/ + /*totvert=dm->getNumVerts(dm);*/ /*UNUSED*/ edit->emitter_cosnos = MEM_callocN(totface * 6 * sizeof(float), "emitter cosnos"); @@ -3443,7 +3443,7 @@ static void brush_puff(PEData *data, int point_index) #else /* translate (not rotate) the rest of the hair if its not selected */ { -#if 0 /* kindof works but looks worse then whats below */ +#if 0 /* kindof works but looks worse then what's below */ /* Move the unselected point on a vector based on the * hair direction and the offset */ @@ -3841,7 +3841,7 @@ static int brush_add(const bContext *C, PEData *data, short number) BLI_assert(mesh); /* Calculate positions of new particles to add, based on brush interseciton - * with object. New particle data is assigned to a correponding to check + * with object. New particle data is assigned to a corresponding to check * index element of add_pars array. This means, that add_pars is a sparse * array. */ diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index f3072163f1f..a73f3dd1be6 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -762,7 +762,7 @@ static int render_break(void *UNUSED(rjv)) } /* runs in thread, no cursor setting here works. careful with notifiers too (malloc conflicts) */ -/* maybe need a way to get job send notifer? */ +/* maybe need a way to get job send notifier? */ static void render_drawlock(void *rjv, int lock) { RenderJob *rj = rjv; diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 606809090d6..cf425234385 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -700,7 +700,7 @@ void ED_area_status_text(ScrArea *sa, const char *str) { ARegion *ar; - /* happens when running transform operators in backround mode */ + /* happens when running transform operators in background mode */ if (sa == NULL) return; @@ -756,7 +756,7 @@ static void area_azone_initialize(wmWindow *win, const bScreen *screen, ScrArea { AZone *az; - /* reinitalize entirely, regions and fullscreen add azones too */ + /* reinitialize entirely, regions and fullscreen add azones too */ BLI_freelistN(&sa->actionzones); if (screen->state != SCREENNORMAL) { @@ -1592,7 +1592,7 @@ void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa) if (sa->type->init) sa->type->init(wm, sa); - /* clear all azones, add the area triange widgets */ + /* clear all azones, add the area triangle widgets */ area_azone_initialize(win, screen, sa); /* region windows, default and own handlers */ @@ -1658,7 +1658,7 @@ void ED_region_cursor_set(wmWindow *win, ScrArea *sa, ARegion *ar) } } -/* for use after changing visiblity of regions */ +/* for use after changing visibility of regions */ void ED_region_visibility_change_update(bContext *C, ARegion *ar) { ScrArea *sa = CTX_wm_area(C); diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 463c15f2696..8f815dd3b44 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -680,7 +680,7 @@ void ED_screen_set_active_region(bContext *C, wmWindow *win, const int xy[2]) } } - /* cursors, for time being set always on edges, otherwise aregion doesnt switch */ + /* cursors, for time being set always on edges, otherwise aregion doesn't switch */ if (scr->active_region == NULL) { screen_cursor_set(win, xy); } diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 951949e18c6..9ce0956aa66 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -4472,7 +4472,7 @@ static void SCREEN_OT_delete(wmOperatorType *ot) /* implementation note: a disappearing region needs at least 1 last draw with 100% backbuffer * texture over it- then triple buffer will clear it entirely. - * This because flag RGN_HIDDEN is set in end - region doesnt draw at all then */ + * This because flag RGN_HIDDEN is set in end - region doesn't draw at all then */ typedef struct RegionAlphaInfo { ScrArea *sa; diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c index da08766b322..a6f367b3d46 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d.c +++ b/source/blender/editors/sculpt_paint/paint_image_2d.c @@ -701,7 +701,7 @@ static void brush_painter_2d_refresh_cache(ImagePaintState *s, BrushPainter *pai do_partial_update_mask = true; renew_maxmask = true; } - /* explicilty disable partial update even if it has been enabled above */ + /* explicitly disable partial update even if it has been enabled above */ if (brush->mask_pressure) { do_partial_update_mask = false; renew_maxmask = true; diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 3ad373f4829..898826ff273 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -571,7 +571,7 @@ static float VecZDepthPersp( } else /* dummy values for zero area face */ w_tmp[0] = w_tmp[1] = w_tmp[2] = 1.0f / 3.0f; - /* done mimicing barycentric_weights_v2() */ + /* done mimicking barycentric_weights_v2() */ return (v1[2] * w_tmp[0]) + (v2[2] * w_tmp[1]) + (v3[2] * w_tmp[2]); } @@ -1695,7 +1695,7 @@ static ProjPixel *project_paint_uvpixel_init( if (ibuf->rect_float) projPixel->pixel.f_pt[0] = 0; else projPixel->pixel.ch_pt[0] = 0; #endif - /* pointer arithmetics */ + /* pointer arithmetic */ projPixel->image_index = projima - ps->projImages; return projPixel; @@ -2586,7 +2586,7 @@ static void project_paint_face_init( v2coSS = ps->screenCoords[lt_vtri[1]]; v3coSS = ps->screenCoords[lt_vtri[2]]; - /* This funtion gives is a concave polyline in UV space from the clipped tri*/ + /* This function gives is a concave polyline in UV space from the clipped tri*/ project_bucket_clip_face( is_ortho, is_flip_object, clip_rect, bucket_bounds, @@ -2620,7 +2620,7 @@ static void project_paint_face_init( //uv[0] = (((float)x) + 0.5f) / ibuf->x; uv[0] = (float)x / ibuf_xf; /* use pixel offset UV coords instead */ - /* Note about IsectPoly2Df_twoside, checking the face or uv flipping doesnt work, + /* Note about IsectPoly2Df_twoside, checking the face or uv flipping doesn't work, * could check the poly direction but better to do this */ if ((do_backfacecull == true && IsectPoly2Df(uv, uv_clip, uv_clip_tot)) || (do_backfacecull == false && IsectPoly2Df_twoside(uv, uv_clip, uv_clip_tot))) @@ -2713,7 +2713,7 @@ static void project_paint_face_init( /* Now create new UV's for the seam face */ float (*outset_uv)[2] = ps->faceSeamUVs[tri_index]; - float insetCos[3][3]; /* inset face coords. NOTE!!! ScreenSace for ortho, Worldspace in prespective view */ + float insetCos[3][3]; /* inset face coords. NOTE!!! ScreenSace for ortho, Worldspace in perspective view */ const float *vCoSS[3]; /* vertex screenspace coords */ diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index c50df664a6a..d62865b44d0 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -1401,7 +1401,7 @@ static void vwpaint_update_cache_variants(bContext *C, VPaint *vp, Object *ob, P Brush *brush = BKE_paint_brush(&vp->paint); /* This effects the actual brush radius, so things farther away - * are compared with a larger radius and vise versa. */ + * are compared with a larger radius and vice versa. */ if (cache->first_time) { RNA_float_get_array(ptr, "location", cache->true_location); } @@ -1724,7 +1724,7 @@ static void do_wpaint_brush_blur_task_cb_ex( } weight_final /= total_hit_loops; - /* Only paint visable verts */ + /* Only paint visible verts */ do_weight_paint_vertex( data->vp, data->ob, data->wpi, v_index, final_alpha, weight_final); @@ -2456,7 +2456,7 @@ void PAINT_OT_vertex_paint_toggle(wmOperatorType *ot) * (return OPERATOR_FINISHED also removes handler and operator) * * For future: - * - implement a stroke event (or mousemove with past positons) + * - implement a stroke event (or mousemove with past positions) * - revise whether op->customdata should be added in object, in set_vpaint */ diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c index 436f4ac5993..d15fd41a510 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c @@ -241,7 +241,7 @@ static int weight_sample_invoke(bContext *C, wmOperator *op, const wmEvent *even } if (changed) { - /* not really correct since the brush didnt change, but redraws the toolbar */ + /* not really correct since the brush didn't change, but redraws the toolbar */ WM_main_add_notifier(NC_BRUSH | NA_EDITED, NULL); /* ts->wpaint->paint.brush */ return OPERATOR_FINISHED; diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index ca671078a82..9168ef8575e 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -1419,7 +1419,7 @@ static void mouse_action_keys(bAnimContext *ac, const int mval[2], short select_ * on either side of mouse click (size of keyframe icon) */ key_hsize = ACHANNEL_HEIGHT(ac) * 0.8f; /* standard channel height (to allow for some slop) */ - key_hsize = roundf(key_hsize / 2.0f); /* half-size (for either side), but rounded up to nearest int (for easier targetting) */ + key_hsize = roundf(key_hsize / 2.0f); /* half-size (for either side), but rounded up to nearest int (for easier targeting) */ UI_view2d_region_to_view(v2d, mval[0] - (int)key_hsize, mval[1], &rectf.xmin, &rectf.ymin); UI_view2d_region_to_view(v2d, mval[0] + (int)key_hsize, mval[1], &rectf.xmax, &rectf.ymax); diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index af35be2c9c1..31fd21081e5 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -1590,7 +1590,7 @@ void CLIP_OT_cursor_set(wmOperatorType *ot) "Cursor location in normalized clip coordinates", -10.0f, 10.0f); } -/********************** macroses *********************/ +/********************** macros *********************/ void ED_operatormacros_clip(void) { diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index 623502045b6..f38a1dc056a 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -1258,7 +1258,7 @@ static void graph_region_draw(const bContext *C, ARegion *ar) UI_view2d_scrollers_draw(C, v2d, scrollers); UI_view2d_scrollers_free(scrollers); - /* currnt frame indicator */ + /* current frame indicator */ if (sc->flag & SC_SHOW_SECONDS) cfra_flag |= DRAWCFRA_UNIT_SECONDS; UI_view2d_view_orthoSpecial(ar, v2d, 1); ANIM_draw_cfra_number(C, v2d, cfra_flag); @@ -1305,7 +1305,7 @@ static void dopesheet_region_draw(const bContext *C, ARegion *ar) UI_view2d_scrollers_draw(C, v2d, scrollers); UI_view2d_scrollers_free(scrollers); - /* currnt frame number indicator */ + /* current frame number indicator */ UI_view2d_view_orthoSpecial(ar, v2d, 1); ANIM_draw_cfra_number(C, v2d, cfra_flag); } diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index 4a71afbcf4a..54f67fa251e 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -595,7 +595,7 @@ void file_draw_list(const bContext *C, ARegion *ar) filelist_cache_previews_update(files); /* Handle preview timer here, since it's filelist_file_cache_block() and filelist_cache_previews_update() - * which controlls previews task. */ + * which controls previews task. */ { const bool previews_running = filelist_cache_previews_running(files); // printf("%s: preview task: %d\n", __func__, previews_running); diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index b19b2ff6cd5..c70829f08f4 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -1301,7 +1301,7 @@ void file_operator_to_sfile(bContext *C, SpaceFile *sfile, wmOperator *op) } /* we could check for relative_path property which is used when converting - * in the other direction but doesnt hurt to do this every time */ + * in the other direction but doesn't hurt to do this every time */ BLI_path_abs(sfile->params->dir, BKE_main_blendfile_path(bmain)); /* XXX, files and dirs updates missing, not really so important though */ diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index fb4b8babda5..81199ce9ad5 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -215,7 +215,7 @@ typedef struct FileListInternEntry { int blentype; /* ID type, in case typeflag has FILE_TYPE_BLENDERLIB set. */ char *relpath; - char *name; /* not striclty needed, but used during sorting, avoids to have to recompute it there... */ + char *name; /* not strictly needed, but used during sorting, avoids to have to recompute it there... */ BLI_stat_t st; } FileListInternEntry; @@ -236,7 +236,7 @@ typedef struct FileListEntryCache { /* This one gathers all entries from both block and misc caches. Used for easy bulk-freing. */ ListBase cached_entries; - /* Block cache: all entries between start and end index. used for part of the list on diplay. */ + /* Block cache: all entries between start and end index. used for part of the list on display. */ FileDirEntry **block_entries; int block_start_index, block_end_index, block_center_index, block_cursor; diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index fa64f2c861d..931e8627b71 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -437,7 +437,7 @@ void fsmenu_read_bookmarks(struct FSMenu *fsmenu, const char *filename) line[len - 1] = '\0'; } /* don't do this because it can be slow on network drives, - * having a bookmark from a drive thats ejected or so isn't + * having a bookmark from a drive that's ejected or so isn't * all _that_ bad */ #if 0 if (BLI_exists(line)) diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index d1847956c13..f05c18d31d5 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -424,7 +424,7 @@ static void file_main_region_draw(const bContext *C, ARegion *ar) v2d->keepofs |= V2D_LOCKOFS_Y; /* XXX this happens on scaling down Screen (like from startup.blend) */ - /* view2d has no type specific for filewindow case, which doesnt scroll vertically */ + /* view2d has no type specific for filewindow case, which doesn't scroll vertically */ if (v2d->cur.ymax < 0) { v2d->cur.ymin -= v2d->cur.ymax; v2d->cur.ymax = 0; diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 92f625ef052..26162266441 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -965,7 +965,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char uiItemR(col, &imaptr, "use_view_as_render", 0, NULL, ICON_NONE); if (ima->source != IMA_SRC_GENERATED) { - if (compact == 0) { /* background image view doesnt need these */ + if (compact == 0) { /* background image view doesn't need these */ ImBuf *ibuf = BKE_image_acquire_ibuf(ima, iuser, NULL); bool has_alpha = true; @@ -1051,7 +1051,7 @@ void uiTemplateImageSettings(uiLayout *layout, PointerRNA *imfptr, bool color_ma PointerRNA display_settings_ptr; PropertyRNA *prop; const int depth_ok = BKE_imtype_valid_depths(imf->imtype); - /* some settings depend on this being a scene thats rendered */ + /* some settings depend on this being a scene that's rendered */ const bool is_render_out = (id && GS(id->name) == ID_SCE); uiLayout *col; diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c index acd0a856f1a..793b1a79b55 100644 --- a/source/blender/editors/space_info/info_ops.c +++ b/source/blender/editors/space_info/info_ops.c @@ -70,7 +70,7 @@ #include "info_intern.h" -/********************* pack blend file libaries operator *********************/ +/********************* pack blend file libraries operator *********************/ static int pack_libraries_exec(bContext *C, wmOperator *op) { @@ -124,7 +124,7 @@ void FILE_OT_unpack_libraries(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } -/********************* toogle auto-pack operator *********************/ +/********************* toggle auto-pack operator *********************/ static int autopack_toggle_exec(bContext *C, wmOperator *op) { diff --git a/source/blender/editors/space_nla/nla_select.c b/source/blender/editors/space_nla/nla_select.c index 6d03354c165..1ce5d0c4859 100644 --- a/source/blender/editors/space_nla/nla_select.c +++ b/source/blender/editors/space_nla/nla_select.c @@ -559,7 +559,7 @@ static void mouse_nla_strips(bContext *C, bAnimContext *ac, const int mval[2], s return; } else { - /* found some channel - we only really should do somethign when its an Nla-Track */ + /* found some channel - we only really should do something when its an Nla-Track */ if (ale->type == ANIMTYPE_NLATRACK) { NlaTrack *nlt = (NlaTrack *)ale->data; diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index edab76cd7e1..e7316604166 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -676,7 +676,7 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node) if (was_output == 0) ED_node_tag_update_nodetree(bmain, ntree, node); - /* addnode() doesnt link this yet... */ + /* addnode() doesn't link this yet... */ node->id = (ID *)BKE_image_verify_viewer(bmain, IMA_TYPE_COMPOSITE, "Viewer Node"); } else if (node->type == CMP_NODE_COMPOSITE) { diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c index c4cd59b65f4..8f3d3d8a4b3 100644 --- a/source/blender/editors/space_node/node_relationships.c +++ b/source/blender/editors/space_node/node_relationships.c @@ -1161,7 +1161,7 @@ static void node_join_attach_recursive(bNode *node, bNode *frame) if (node->parent->done & NODE_JOIN_IS_DESCENDANT) node->done |= NODE_JOIN_IS_DESCENDANT; else if (node->flag & NODE_TEST) { - /* if parent is not an decendant of the frame, reattach the node */ + /* if parent is not an descendant of the frame, reattach the node */ nodeDetachNode(node); nodeAttachNode(node, frame); node->done |= NODE_JOIN_IS_DESCENDANT; @@ -1327,7 +1327,7 @@ static void node_detach_recursive(bNode *node) if (node->parent->done & NODE_DETACH_IS_DESCENDANT) node->done |= NODE_DETACH_IS_DESCENDANT; else if (node->flag & NODE_SELECT) { - /* if parent is not a decendant of a selected node, detach */ + /* if parent is not a descendant of a selected node, detach */ nodeDetachNode(node); node->done |= NODE_DETACH_IS_DESCENDANT; } @@ -1590,7 +1590,7 @@ static void node_link_insert_offset_frame_chains( /** * Callback that applies NodeInsertOfsData.offset_x to a node or its parent, - * considering the logic needed for offseting nodes after link insert + * considering the logic needed for offsetting nodes after link insert */ static bool node_link_insert_offset_chain_cb( bNode *fromnode, bNode *tonode, @@ -1648,7 +1648,7 @@ static void node_link_insert_offset_ntree( /* insert->totr isn't updated yet, so totr_insert is used to get the correct worldspace coords */ node_to_updated_rect(insert, &totr_insert); - /* frame attachement was't handled yet so we search the frame that the node will be attached to later */ + /* frame attachment wasn't handled yet so we search the frame that the node will be attached to later */ insert->parent = node_find_frame_to_attach(ar, ntree, mouse_xy); /* this makes sure nodes are also correctly offset when inserting a node on top of a frame diff --git a/source/blender/editors/space_node/node_view.c b/source/blender/editors/space_node/node_view.c index 00eab0c69c1..22df2586a7b 100644 --- a/source/blender/editors/space_node/node_view.c +++ b/source/blender/editors/space_node/node_view.c @@ -193,7 +193,7 @@ void NODE_OT_view_selected(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } -/* **************** Backround Image Operators ************** */ +/* **************** Background Image Operators ************** */ typedef struct NodeViewMove { int mvalo[2]; diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index c1d86da3eab..c43f3d7eaf4 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -248,7 +248,7 @@ static TreeTraversalAction collection_find_data_to_edit(TreeElement *te, void *c } if (collection == BKE_collection_master(data->scene)) { - /* skip - showing warning/error message might be missleading + /* skip - showing warning/error message might be misleading * when deleting multiple collections, so just do nothing */ } else { @@ -601,7 +601,7 @@ static TreeTraversalAction layer_collection_find_data_to_edit(TreeElement *te, v LayerCollection *lc = te->directdata; if (lc->collection->flag & COLLECTION_IS_MASTER) { - /* skip - showing warning/error message might be missleading + /* skip - showing warning/error message might be misleading * when deleting multiple collections, so just do nothing */ } else { diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 2f7d8b7523c..f95081da4a5 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -842,7 +842,7 @@ static void outliner_buttons(const bContext *C, uiBlock *block, ARegion *ar, Tre if (false == UI_but_active_only(C, ar, block, bt)) { tselem->flag &= ~TSE_TEXTBUT; - /* bad! (notifier within draw) without this, we don't get a refesh */ + /* bad! (notifier within draw) without this, we don't get a refresh */ WM_event_add_notifier(C, NC_SPACE | ND_SPACE_OUTLINER, NULL); } } @@ -1355,7 +1355,7 @@ static void tselem_draw_icon( y += 2.0f * aspect; /* restrict column clip... it has been coded by simply overdrawing, - * doesnt work for buttons */ + * doesn't work for buttons */ UI_icon_draw_alpha(x, y, data.icon, alpha); } else { @@ -1453,7 +1453,7 @@ static void outliner_draw_iconrow_doit( /** * Return the index to use based on the TreeElement ID and object type * - * We use a continuum of indeces until we get to the object datablocks + * We use a continuum of indices until we get to the object datablocks * and we then make room for the object types. */ static int tree_element_id_type_to_index(TreeElement *te) diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index 99411df3fda..9d25987f494 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -162,7 +162,7 @@ typedef enum { #define SEARCHING_OUTLINER(sov) (sov->search_flags & SO_SEARCH_RECURSIVE) -/* is the currrent element open? if so we also show children */ +/* is the current element open? if so we also show children */ #define TSELEM_OPEN(telm, sv) ( (telm->flag & TSE_CLOSED) == 0 || (SEARCHING_OUTLINER(sv) && (telm->flag & TSE_CHILDSEARCH)) ) /* outliner_tree.c ----------------------------------------------- */ diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 84af223733d..2f84340e34e 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -1165,7 +1165,7 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op) { /* make local */ outliner_do_libdata_operation(C, op->reports, scene, soops, &soops->tree, id_static_override_cb, NULL); - ED_undo_push(C, "Overrided Data"); + ED_undo_push(C, "Overridden Data"); break; } case OUTLINER_IDOP_SINGLE: diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 170a54cd404..49accadbb3a 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -769,7 +769,7 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i tselem->flag |= TSE_CHILDSEARCH; te->parent = parent; - te->index = index; // for data arays + te->index = index; // for data arrays if (ELEM(type, TSE_SEQUENCE, TSE_SEQ_STRIP, TSE_SEQUENCE_DUP)) { /* pass */ } @@ -933,7 +933,7 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i int a, tot; - /* we do lazy build, for speed and to avoid infinite recusion */ + /* we do lazy build, for speed and to avoid infinite recursion */ if (ptr->data == NULL) { te->name = IFACE_("(empty)"); @@ -1456,7 +1456,7 @@ static int treesort_alpha(const void *v1, const void *v2) } -/* this is nice option for later? doesnt look too useful... */ +/* this is nice option for later? doesn't look too useful... */ #if 0 static int treesort_obtype_alpha(const void *v1, const void *v2) { diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 3cd5bfc3e58..18fd1eae417 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -166,7 +166,7 @@ static void sequencer_generic_invoke_xy__internal(bContext *C, wmOperator *op, i RNA_int_set(op->ptr, "frame_start", cfra); if ((flag & SEQPROP_ENDFRAME) && RNA_struct_property_is_set(op->ptr, "frame_end") == 0) - RNA_int_set(op->ptr, "frame_end", cfra + 25); // XXX arbitary but ok for now. + RNA_int_set(op->ptr, "frame_end", cfra + 25); // XXX arbitrary but ok for now. if (!(flag & SEQPROP_NOPATHS)) { sequencer_generic_invoke_path__internal(C, op, "filepath"); diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 083b4548b29..2ffc3971e18 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -560,7 +560,7 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen switch (BKE_sequence_effect_get_num_inputs(type)) { case 0: *selseq1 = *selseq2 = *selseq3 = NULL; - return 1; /* succsess */ + return 1; /* success */ case 1: if (seq2 == NULL) { *error_str = N_("At least one selected sequence strip is needed"); @@ -1379,7 +1379,7 @@ static int sequencer_slip_invoke(bContext *C, wmOperator *op, const wmEvent *eve int num_seq, i; View2D *v2d = UI_view2d_fromcontext(C); - /* first recursively cound the trimmed elements */ + /* first recursively count the trimmed elements */ num_seq = slip_count_sequences_rec(ed->seqbasep, true); if (num_seq == 0) @@ -1487,7 +1487,7 @@ static int sequencer_slip_exec(bContext *C, wmOperator *op) int offset = RNA_int_get(op->ptr, "offset"); bool success = false; - /* first recursively cound the trimmed elements */ + /* first recursively count the trimmed elements */ num_seq = slip_count_sequences_rec(ed->seqbasep, true); if (num_seq == 0) @@ -2652,7 +2652,7 @@ static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op)) BLI_remlink(ed->seqbasep, last_seq); BKE_sequence_free(scene, last_seq); - /* emtpy meta strip, delete all effects depending on it */ + /* empty meta strip, delete all effects depending on it */ for (seq = ed->seqbasep->first; seq; seq = seq->next) if ((seq->type & SEQ_TYPE_EFFECT) && seq_depends_on_meta(seq, last_seq)) seq->flag |= SEQ_FLAG_DELETE; diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 5391bacf9a1..5b5f41ccb32 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -1167,7 +1167,7 @@ static bool select_grouped_effect_link(Editing *ed, Sequence *actseq, const int continue; } - /* If the seq is an effect one, we need extra cheking! */ + /* If the seq is an effect one, we need extra checking! */ if (SEQ_IS_EFFECT(seq) && ((seq->seq1 && seq->seq1->tmp) || (seq->seq2 && seq->seq2->tmp) || (seq->seq3 && seq->seq3->tmp))) @@ -1186,7 +1186,7 @@ static bool select_grouped_effect_link(Editing *ed, Sequence *actseq, const int BKE_sequence_iterator_begin(ed, &iter, true); } - /* Video strips bellow active one, or any strip for audio (order do no matters here!). */ + /* Video strips below active one, or any strip for audio (order do no matters here!). */ else if (seq->machine < machine || is_audio) { seq->flag |= SELECT; changed = true; diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index c5d5a9695f8..9d73a857e3b 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -667,7 +667,7 @@ static void sequencer_preview_region_listener( case NC_ANIMATION: switch (wmn->data) { case ND_KEYFRAME: - /* Otherwise, often prevents seing immediately effects of keyframe editing... */ + /* Otherwise, often prevents seeing immediately effects of keyframe editing... */ BKE_sequencer_cache_cleanup(); ED_region_tag_redraw(ar); break; diff --git a/source/blender/editors/space_text/text_format_lua.c b/source/blender/editors/space_text/text_format_lua.c index 8b6ec2d804b..2a92f9a4d7d 100644 --- a/source/blender/editors/space_text/text_format_lua.c +++ b/source/blender/editors/space_text/text_format_lua.c @@ -69,7 +69,7 @@ static int txtfmt_lua_find_keyword(const char *string) else if (STR_LITERAL_STARTSWITH(string, "while", len)) i = len; else i = 0; - /* If next source char is an identifier (eg. 'i' in "definate") no match */ + /* If next source char is an identifier (eg. 'i' in "definite") no match */ if (i == 0 || text_check_identifier(string[i])) return -1; return i; @@ -120,7 +120,7 @@ static int txtfmt_lua_find_specialvar(const char *string) else if (STR_LITERAL_STARTSWITH(string, "xpcall", len)) i = len; else i = 0; - /* If next source char is an identifier (eg. 'i' in "definate") no match */ + /* If next source char is an identifier (eg. 'i' in "definite") no match */ if (i == 0 || text_check_identifier(string[i])) return -1; return i; diff --git a/source/blender/editors/space_text/text_format_osl.c b/source/blender/editors/space_text/text_format_osl.c index 2daaaa348e6..2b2dfef72d3 100644 --- a/source/blender/editors/space_text/text_format_osl.c +++ b/source/blender/editors/space_text/text_format_osl.c @@ -66,7 +66,7 @@ static int txtfmt_osl_find_builtinfunc(const char *string) else if (STR_LITERAL_STARTSWITH(string, "while", len)) i = len; else i = 0; - /* If next source char is an identifier (eg. 'i' in "definate") no match */ + /* If next source char is an identifier (eg. 'i' in "definite") no match */ if (i == 0 || text_check_identifier(string[i])) return -1; return i; @@ -116,7 +116,7 @@ static int txtfmt_osl_find_reserved(const char *string) else if (STR_LITERAL_STARTSWITH(string, "volatile", len)) i = len; else i = 0; - /* If next source char is an identifier (eg. 'i' in "definate") no match */ + /* If next source char is an identifier (eg. 'i' in "definite") no match */ if (i == 0 || text_check_identifier(string[i])) return -1; return i; @@ -140,7 +140,7 @@ static int txtfmt_osl_find_specialvar(const char *string) else if (STR_LITERAL_STARTSWITH(string, "displacement", len)) i = len; else i = 0; - /* If next source char is an identifier (eg. 'i' in "definate") no match */ + /* If next source char is an identifier (eg. 'i' in "definite") no match */ if (i == 0 || text_check_identifier(string[i])) return -1; return i; diff --git a/source/blender/editors/space_text/text_format_pov.c b/source/blender/editors/space_text/text_format_pov.c index 4c9abecedd6..f6b6d4f8d42 100644 --- a/source/blender/editors/space_text/text_format_pov.c +++ b/source/blender/editors/space_text/text_format_pov.c @@ -83,7 +83,7 @@ static int txtfmt_pov_find_keyword(const char *string) else if (STR_LITERAL_STARTSWITH(string, "if", len)) i = len; else i = 0; - /* If next source char is an identifier (eg. 'i' in "definate") no match */ + /* If next source char is an identifier (eg. 'i' in "definite") no match */ return (i == 0 || text_check_identifier(string[i])) ? -1 : i; } @@ -236,7 +236,7 @@ static int txtfmt_pov_find_reserved_keywords(const char *string) else if (STR_LITERAL_STARTSWITH(string, "str", len)) i = len; else i = 0; - /* If next source char is an identifier (eg. 'i' in "definate") no match */ + /* If next source char is an identifier (eg. 'i' in "definite") no match */ return (i == 0 || text_check_identifier(string[i])) ? -1 : i; } @@ -466,7 +466,7 @@ static int txtfmt_pov_find_reserved_builtins(const char *string) else if (STR_LITERAL_STARTSWITH(string, "z", len)) i = len; else i = 0; - /* If next source char is an identifier (eg. 'i' in "definate") no match */ + /* If next source char is an identifier (eg. 'i' in "definite") no match */ return (i == 0 || text_check_identifier(string[i])) ? -1 : i; } @@ -683,7 +683,7 @@ static int txtfmt_pov_find_specialvar(const char *string) else if (STR_LITERAL_STARTSWITH(string, "gall", len)) i = len; else i = 0; - /* If next source char is an identifier (eg. 'i' in "definate") no match */ + /* If next source char is an identifier (eg. 'i' in "definite") no match */ return (i == 0 || text_check_identifier(string[i])) ? -1 : i; } diff --git a/source/blender/editors/space_text/text_format_pov_ini.c b/source/blender/editors/space_text/text_format_pov_ini.c index 453dd1d748c..ae7d784dffc 100644 --- a/source/blender/editors/space_text/text_format_pov_ini.c +++ b/source/blender/editors/space_text/text_format_pov_ini.c @@ -93,7 +93,7 @@ static int txtfmt_ini_find_keyword(const char *string) else i = 0; - /* If next source char is an identifier (eg. 'i' in "definate") no match */ + /* If next source char is an identifier (eg. 'i' in "definite") no match */ return (i == 0 || text_check_identifier(string[i])) ? -1 : i; } @@ -299,7 +299,7 @@ static int txtfmt_ini_find_reserved(const char *string) else i = 0; - /* If next source char is an identifier (eg. 'i' in "definate") no match */ + /* If next source char is an identifier (eg. 'i' in "definite") no match */ return (i == 0 || text_check_identifier(string[i])) ? -1 : i; } diff --git a/source/blender/editors/space_text/text_format_py.c b/source/blender/editors/space_text/text_format_py.c index 2f6962f0493..3576d12998f 100644 --- a/source/blender/editors/space_text/text_format_py.c +++ b/source/blender/editors/space_text/text_format_py.c @@ -89,7 +89,7 @@ static int txtfmt_py_find_builtinfunc(const char *string) else if (STR_LITERAL_STARTSWITH(string, "yield", len)) i = len; else i = 0; - /* If next source char is an identifier (eg. 'i' in "definate") no match */ + /* If next source char is an identifier (eg. 'i' in "definite") no match */ if (i == 0 || text_check_identifier(string[i])) return -1; return i; @@ -110,7 +110,7 @@ static int txtfmt_py_find_specialvar(const char *string) else if (STR_LITERAL_STARTSWITH(string, "class", len)) i = len; else i = 0; - /* If next source char is an identifier (eg. 'i' in "definate") no match */ + /* If next source char is an identifier (eg. 'i' in "definite") no match */ if (i == 0 || text_check_identifier(string[i])) return -1; return i; diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index a8c14a3d4c1..28eb4572a1a 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -3196,7 +3196,7 @@ static int text_resolve_conflict_invoke(bContext *C, wmOperator *op, const wmEve switch (BKE_text_file_modified_check(text)) { case 1: if (text->flags & TXT_ISDIRTY) { - /* modified locally and externally, ahhh. offer more possibilites. */ + /* modified locally and externally, ahhh. offer more possibilities. */ pup = UI_popup_menu_begin(C, IFACE_("File Modified Outside and Inside Blender"), ICON_NONE); layout = UI_popup_menu_layout(pup); uiItemEnumO_ptr(layout, op->type, IFACE_("Reload from disk (ignore local changes)"), diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c index c6874a663a5..46bd57df7f5 100644 --- a/source/blender/editors/space_view3d/drawvolume.c +++ b/source/blender/editors/space_view3d/drawvolume.c @@ -297,7 +297,7 @@ static int create_view_aligned_slices(VolumeSlicer *slicer, float plane_dist = min_dist; float plane_dist_inc = (max_dist - min_dist) / (float)num_slices; - /* for all egdes */ + /* for all edges */ for (int i = 0; i < 12; i++) { copy_v3_v3(vec_start[i], vertices[edges[edge_list[max_index][i]][0]]); copy_v3_v3(vec_dir[i], vertices[edges[edge_list[max_index][i]][1]]); diff --git a/source/blender/editors/space_view3d/view3d_camera_control.c b/source/blender/editors/space_view3d/view3d_camera_control.c index d0475684262..24871e16db6 100644 --- a/source/blender/editors/space_view3d/view3d_camera_control.c +++ b/source/blender/editors/space_view3d/view3d_camera_control.c @@ -88,7 +88,7 @@ typedef struct View3DCameraControl { /* -------------------------------------------------------------------- */ - /* intial values */ + /* initial values */ /* root most parent */ Object *root_parent; @@ -303,7 +303,7 @@ void ED_view3d_cameracontrol_release( DEG_id_tag_update(&ob_back->id, OB_RECALC_OB); } else { - /* Non Camera we need to reset the view back to the original location bacause the user canceled*/ + /* Non Camera we need to reset the view back to the original location because the user canceled*/ copy_qt_qt(rv3d->viewquat, vctrl->rot_backup); rv3d->persp = vctrl->persp_backup; } diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 1091b7a7f63..735b4e5bec0 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1194,7 +1194,7 @@ void view3d_draw_region_info(const bContext *C, ARegion *ar, const int UNUSED(of /* correct projection matrix */ ED_region_pixelspace(ar); - /* local coordinate visible rect inside region, to accomodate overlapping ui */ + /* local coordinate visible rect inside region, to accommodate overlapping ui */ rcti rect; ED_region_visible_rect(ar, &rect); @@ -1255,14 +1255,14 @@ static void view3d_draw_view(const bContext *C, ARegion *ar) { ED_view3d_draw_setup_view(CTX_wm_window(C), CTX_data_depsgraph(C), CTX_data_scene(C), ar, CTX_wm_view3d(C), NULL, NULL, NULL); - /* Only 100% compliant on new spec goes bellow */ + /* Only 100% compliant on new spec goes below */ DRW_draw_view(C); } RenderEngineType *ED_view3d_engine_type(Scene *scene, int drawtype) { /* - * Tempory viewport draw modes until we have a proper system. + * Temporary viewport draw modes until we have a proper system. * all modes are done in the draw manager, except * cycles material as it is an external render engine. */ diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index e359b2b88f5..732ee302ac5 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -802,7 +802,7 @@ static void viewrotate_apply(ViewOpsData *vod, const int event_xy[2]) /* avoid precision loss over time */ normalize_qt(vod->curr.viewquat); - /* use a working copy so view rotation locking doesnt overwrite the locked + /* use a working copy so view rotation locking doesn't overwrite the locked * rotation back into the view we calculate with */ copy_qt_qt(rv3d->viewquat, vod->curr.viewquat); @@ -1045,7 +1045,7 @@ static float view3d_ndof_pan_speed_calc(RegionView3D *rv3d) /** * Zoom and pan in the same function since sometimes zoom is interpreted as dolly (pan forward). * - * \param has_zoom zoom, otherwise dolly, often `!rv3d->is_persp` since it doesnt make sense to dolly in ortho. + * \param has_zoom zoom, otherwise dolly, often `!rv3d->is_persp` since it doesn't make sense to dolly in ortho. */ static void view3d_ndof_pan_zoom( const struct wmNDOFMotionData *ndof, ScrArea *sa, ARegion *ar, @@ -3858,7 +3858,7 @@ static int view_camera_exec(bContext *C, wmOperator *op) if (v3d->camera == NULL) v3d->camera = BKE_view_layer_camera_find(view_layer); - /* couldnt find any useful camera, bail out */ + /* couldn't find any useful camera, bail out */ if (v3d->camera == NULL) return OPERATOR_CANCELLED; diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 3cf036e1ce1..ae883f53f18 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -28,7 +28,7 @@ #ifdef WITH_INPUT_NDOF //# define NDOF_FLY_DEBUG -//# define NDOF_FLY_DRAW_TOOMUCH /* is this needed for ndof? - commented so redraw doesnt thrash - campbell */ +//# define NDOF_FLY_DRAW_TOOMUCH /* is this needed for ndof? - commented so redraw doesn't thrash - campbell */ #endif /* WITH_INPUT_NDOF */ #include "DNA_object_types.h" @@ -154,7 +154,7 @@ void fly_modal_keymap(wmKeyConfig *keyconf) WM_modalkeymap_add_item(keymap, MOUSEPAN, 0, 0, 0, FLY_MODAL_SPEED); WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_PRESS, KM_ANY, 0, FLY_MODAL_PAN_ENABLE); - /* XXX - Bug in the event system, middle mouse release doesnt work */ + /* XXX - Bug in the event system, middle mouse release doesn't work */ WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_RELEASE, KM_ANY, 0, FLY_MODAL_PAN_DISABLE); /* WASD */ @@ -746,7 +746,7 @@ static int flyApply(bContext *C, FlyInfo *fly) RegionView3D *rv3d = fly->rv3d; float mat[3][3]; /* 3x3 copy of the view matrix so we can move along the view axis */ - float dvec[3] = {0, 0, 0}; /* this is the direction thast added to the view offset per redraw */ + float dvec[3] = {0, 0, 0}; /* this is the direction that's added to the view offset per redraw */ /* Camera Uprighting variables */ float moffset[2]; /* mouse offset from the views center */ diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 5f0c814dcb2..a3bd31423e8 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -1817,7 +1817,7 @@ static bool ed_object_select_pick( /* Set special modes for grease pencil The grease pencil modes are not real modes, but a hack to make the interface consistent, so need some tricks to keep UI synchronized */ - // XXX: This stuff neeeds reviewing (Aligorith) + // XXX: This stuff needs reviewing (Aligorith) if (false && (((oldbasact) && oldbasact->object->type == OB_GPENCIL) || (basact->object->type == OB_GPENCIL))) diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c index e4e12cc3686..c5b7725541c 100644 --- a/source/blender/editors/space_view3d/view3d_walk.c +++ b/source/blender/editors/space_view3d/view3d_walk.c @@ -65,7 +65,7 @@ #ifdef WITH_INPUT_NDOF //# define NDOF_WALK_DEBUG -//# define NDOF_WALK_DRAW_TOOMUCH /* is this needed for ndof? - commented so redraw doesnt thrash - campbell */ +//# define NDOF_WALK_DRAW_TOOMUCH /* is this needed for ndof? - commented so redraw doesn't thrash - campbell */ #endif #define USE_TABLET_SUPPORT @@ -450,7 +450,7 @@ static bool walk_floor_distance_get( ray_start, ray_normal, r_distance, r_location, r_normal_dummy); - /* artifically scale the distance to the scene size */ + /* artificially scale the distance to the scene size */ *r_distance /= walk->grid; return ret; } @@ -489,7 +489,7 @@ static bool walk_ray_cast( negate_v3(r_normal); } - /* artifically scale the distance to the scene size */ + /* artificially scale the distance to the scene size */ *ray_distance /= walk->grid; return ret; @@ -1069,7 +1069,7 @@ static int walkApply(bContext *C, wmOperator *op, WalkInfo *walk) /* speed factor */ y *= WALK_ROTATE_FAC; - /* user adjustement factor */ + /* user adjustment factor */ y *= walk->mouse_speed; /* clamp the angle limits */ @@ -1107,7 +1107,7 @@ static int walkApply(bContext *C, wmOperator *op, WalkInfo *walk) /* speed factor */ x *= WALK_ROTATE_FAC; - /* user adjustement factor */ + /* user adjustment factor */ x *= walk->mouse_speed; /* Rotate about the relative up vec */ diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 02edb04e2ff..bfd678d83ea 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -235,7 +235,7 @@ bool transdata_check_local_islands(TransInfo *t, short around) (ELEM(t->obedit_type, OB_MESH)))); } -/* ************************** SPACE DEPENDANT CODE **************************** */ +/* ************************** SPACE DEPENDENT CODE **************************** */ void setTransformViewMatrices(TransInfo *t) { @@ -2050,7 +2050,7 @@ static void drawTransformPixel(const struct bContext *UNUSED(C), ARegion *ar, vo /* draw autokeyframing hint in the corner * - only draw if enabled (advanced users may be distracted/annoyed), - * for objects that will be autokeyframed (no point ohterwise), + * for objects that will be autokeyframed (no point otherwise), * AND only for the active region (as showing all is too overwhelming) */ if ((U.autokey_flag & AUTOKEY_FLAG_NOWARNING) == 0) { @@ -2860,7 +2860,7 @@ static void constraintTransLim(TransInfo *t, TransData *td) mul_m4_m3m4(cob.matrix, td->mtx, cob.matrix); } else if (con->ownspace != CONSTRAINT_SPACE_LOCAL) { - /* skip... incompatable spacetype */ + /* skip... incompatible spacetype */ continue; } @@ -2936,7 +2936,7 @@ static void constraintRotLim(TransInfo *UNUSED(t), TransData *td) if ((data->flag2 & LIMIT_TRANSFORM) == 0) continue; - /* skip incompatable spacetypes */ + /* skip incompatible spacetypes */ if (!ELEM(con->ownspace, CONSTRAINT_SPACE_WORLD, CONSTRAINT_SPACE_LOCAL)) continue; @@ -6186,7 +6186,7 @@ static void calcEdgeSlideCustomPoints(struct TransInfo *t) setCustomPoints(t, &t->mouse, sld->mval_end, sld->mval_start); /* setCustomPoints isn't normally changing as the mouse moves, - * in this case apply mouse input immediatly so we don't refresh + * in this case apply mouse input immediately so we don't refresh * with the value from the previous points */ applyMouseInput(t, &t->mouse, t->mval, t->values); } @@ -7579,7 +7579,7 @@ static void calcVertSlideCustomPoints(struct TransInfo *t) } /* setCustomPoints isn't normally changing as the mouse moves, - * in this case apply mouse input immediatly so we don't refresh + * in this case apply mouse input immediately so we don't refresh * with the value from the previous points */ applyMouseInput(t, &t->mouse, t->mval, t->values); } diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 98d8b6d8611..8bcfed9d716 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -126,7 +126,7 @@ typedef struct TransCon { float imtx[3][3]; /* Inverse Matrix of the Constraint space */ float pmtx[3][3]; /* Projection Constraint Matrix (same as imtx with some axis == 0) */ int imval[2]; /* initial mouse value for visual calculation */ - /* the one in TransInfo is not garanty to stay the same (Rotates change it) */ + /* the one in TransInfo is not guarantee to stay the same (Rotates change it) */ int mode; /* Mode flags of the Constraint */ void (*drawExtra)(struct TransInfo *t); @@ -163,7 +163,7 @@ typedef struct TransDataExtension { float r_mtx[3][3]; /* The rotscale matrix of pose bone, to allow using snap-align in translation mode, * when td->mtx is the loc pose bone matrix (and hence can't be used to apply rotation in some cases, * namely when a bone is in "NoLocal" or "Hinge" mode)... */ - float r_smtx[3][3]; /* Invers of previous one. */ + float r_smtx[3][3]; /* Inverse of previous one. */ int rotOrder; /* rotation mode, as defined in eRotationModes (DNA_action_types.h) */ float oloc[3], orot[3], oquat[4], orotAxis[3], orotAngle; /* Original object transformation used for rigid bodies */ } TransDataExtension; @@ -176,7 +176,7 @@ typedef struct TransData2D { float ih1[2], ih2[2]; } TransData2D; -/* we need to store 2 handles for each transdata in case the other handle wasnt selected */ +/* we need to store 2 handles for each transdata in case the other handle wasn't selected */ typedef struct TransDataCurveHandleFlags { char ih1, ih2; char *h1, *h2; @@ -593,7 +593,7 @@ typedef struct TransInfo { #define T_AUTOVALUES (1 << 20) - /* to specificy if we save back settings at the end */ + /* to specify if we save back settings at the end */ #define T_MODAL (1 << 21) /* no retopo */ diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index ebf5c9b6d4e..e22a455b7fa 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2377,7 +2377,7 @@ static struct TransIslandData *editmesh_islands_info_calc( vert_map = MEM_mallocN(sizeof(*vert_map) * bm->totvert, __func__); /* we shouldn't need this, but with incorrect selection flushing - * its possible we have a selected vertex thats not in a face, for now best not crash in that case. */ + * its possible we have a selected vertex that's not in a face, for now best not crash in that case. */ copy_vn_i(vert_map, bm->totvert, -1); BM_mesh_elem_table_ensure(bm, htype); @@ -2990,7 +2990,7 @@ void flushTransSeq(TransInfo *t) if (seq != seq_prev) { if (seq->depth == 0) { - /* test overlap, displayes red outline */ + /* test overlap, displays red outline */ seq->flag &= ~SEQ_OVERLAP; if (BKE_sequence_test_overlap(seqbasep, seq)) { seq->flag |= SEQ_OVERLAP; diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 7a852f36139..a9c77dc8773 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -318,7 +318,7 @@ static void animrecord_check_state(Scene *scene, ID *id, wmTimer *animtimer) * NOTE: An alternative way would have been to instead hack the influence * to not get always get reset to full strength if NLASTRIP_FLAG_USR_INFLUENCE * is disabled but auto-blending isn't being used. However, that approach - * is a bit hacky/hard to discover, and may cause backwards compatability issues, + * is a bit hacky/hard to discover, and may cause backwards compatibility issues, * so it's better to just do it this way. */ strip->flag |= NLASTRIP_FLAG_USR_INFLUENCE; diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index 0f3f335248a..9a2c69d5a46 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -659,7 +659,7 @@ void ED_transform_calc_orientation_from_type_ex( if (ob->mode & OB_MODE_POSE) { /* each bone moves on its own local axis, but to avoid confusion, * use the active pones axis for display [#33575], this works as expected on a single bone - * and users who select many bones will understand whats going on and what local means + * and users who select many bones will understand what's going on and what local means * when they start transforming */ ED_getTransformOrientationMatrix(C, r_mat, pivot_point); ok = true; @@ -816,7 +816,7 @@ int ED_transform_calc_gizmo_stats( BMEditSelection ese; float vec[3] = {0, 0, 0}; - /* USE LAST SELECTE WITH ACTIVE */ + /* USE LAST SELECT WITH ACTIVE */ if ((pivot_point == V3D_AROUND_ACTIVE) && BM_select_history_active_get(em->bm, &ese)) { BM_editselection_center(&ese, vec); calc_tw_center(tbounds, vec); diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 873eb1c79b5..9df1fef1a3c 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -659,7 +659,7 @@ int getTransformOrientation_ex(const bContext *C, float normal[3], float plane[3 } if (em->bm->totedgesel >= 1) { - /* find an edge thats apart of v_tri (no need to search all edges) */ + /* find an edge that's apart of v_tri (no need to search all edges) */ float e_length; int j; diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 7b8f95dfeaa..a3ce35a223a 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -194,7 +194,7 @@ static SnapObjectData_EditMesh *snap_object_data_editmesh_create(SnapObjectConte } /** - * Walks through all objects in the scene to create the list of objets to snap. + * Walks through all objects in the scene to create the list of objects to snap. * * \param sctx: Snap context to store data. * \param snap_select : from enum eSnapSelect. diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 27e67580979..fe4e957befc 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -1689,7 +1689,7 @@ static void uv_weld_align(bContext *C, eUVWeldAlign tool) if (BM_elem_flag_test(eed, BM_ELEM_TAG)) { BMVert *eve_other = BM_edge_other_vert(eed, eve); if (BM_elem_flag_test(eve_other, BM_ELEM_TAG)) { - /* this is a tagged vert we didnt walk over yet, step onto it */ + /* this is a tagged vert we didn't walk over yet, step onto it */ eve_next = eve_other; break; } diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index 4e26c70a82a..c358cffa0b4 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -2625,7 +2625,7 @@ static int stitch_modal(bContext *C, wmOperator *op, const wmEvent *event) if (goto_next_island(ssc)) { StitchState *new_active_state = ssc->states[ssc->active_object_index]; - /* active_state is the origional active state */ + /* active_state is the original active state */ if (active_state != new_active_state) { if (!stitch_process_data(ssc, active_state, scene, false)) { stitch_cancel(C, op); diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index cd83cc4f454..2e3ff5a5065 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -1468,7 +1468,7 @@ static int unwrap_exec(bContext *C, wmOperator *op) else RNA_enum_set(op->ptr, "method", scene->toolsettings->unwrapper); - /* remember packing marging */ + /* remember packing margin */ if (RNA_struct_property_is_set(op->ptr, "margin")) scene->toolsettings->uvcalc_margin = RNA_float_get(op->ptr, "margin"); else |