From 27907408136cd3339beac5ea98318830ff837ab6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 17 Aug 2019 00:54:22 +1000 Subject: Cleanup: spelling --- .../blender/editors/animation/anim_motion_paths.c | 5 ++--- source/blender/editors/animation/keyingsets.c | 6 +++--- source/blender/editors/armature/armature_add.c | 2 +- source/blender/editors/curve/editcurve_paint.c | 4 ++-- .../gizmo_library/gizmo_types/arrow3d_gizmo.c | 4 ++-- .../gizmo_library/gizmo_types/cage3d_gizmo.c | 2 +- source/blender/editors/gpencil/gpencil_edit.c | 22 ++++++++++------------ source/blender/editors/interface/view2d_ops.c | 2 +- source/blender/editors/mesh/editmesh_knife.c | 2 +- source/blender/editors/screen/screen_edit.c | 2 +- source/blender/editors/screen/screen_ops.c | 2 +- .../editors/sculpt_paint/paint_image_proj.c | 4 ++-- source/blender/editors/space_view3d/view3d_edit.c | 4 +--- source/blender/editors/space_view3d/view3d_utils.c | 4 ++-- source/blender/editors/transform/transform.c | 2 +- source/blender/editors/transform/transform_input.c | 2 +- 16 files changed, 32 insertions(+), 37 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/animation/anim_motion_paths.c b/source/blender/editors/animation/anim_motion_paths.c index 7a5b57b1ce6..bd4886817cd 100644 --- a/source/blender/editors/animation/anim_motion_paths.c +++ b/source/blender/editors/animation/anim_motion_paths.c @@ -60,9 +60,8 @@ typedef struct MPathTarget { Object *ob; /* source object */ bPoseChannel *pchan; /* source posechannel (if applicable) */ - /* "Evaluated" Copies (these come from the background COW copie - * that provide all the coordinates we want to save off) - */ + /* "Evaluated" Copies (these come from the background COW copy + * that provide all the coordinates we want to save off). */ Object *ob_eval; /* evaluated object */ } MPathTarget; diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index ccd0fc54611..7d31c6d3e3a 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -712,9 +712,9 @@ int ANIM_scene_get_keyingset_index(Scene *scene, KeyingSet *ks) } } - /* still here, so try builtins list too - * - builtins are from (<= -1) - * - none/invalid is (= 0) + /* Still here, so try built-ins list too: + * - Built-ins are from (<= -1). + * - None/Invalid is (= 0). */ index = BLI_findindex(&builtin_keyingsets, ks); if (index != -1) { diff --git a/source/blender/editors/armature/armature_add.c b/source/blender/editors/armature/armature_add.c index d2fa77f90be..1073034383d 100644 --- a/source/blender/editors/armature/armature_add.c +++ b/source/blender/editors/armature/armature_add.c @@ -769,7 +769,7 @@ static int armature_symmetrize_exec(bContext *C, wmOperator *op) EditBone *ebone = ebone_iter->temp.ebone; - /* copy flags incase bone is pre-existing data */ + /* Copy flags in case bone is pre-existing data. */ ebone->flag = (ebone->flag & ~flag_copy) | (ebone_iter->flag & flag_copy); if (ebone_iter->parent == NULL) { diff --git a/source/blender/editors/curve/editcurve_paint.c b/source/blender/editors/curve/editcurve_paint.c index 5e0053782d4..c7c19aa2d02 100644 --- a/source/blender/editors/curve/editcurve_paint.c +++ b/source/blender/editors/curve/editcurve_paint.c @@ -120,7 +120,7 @@ struct CurveDrawData { struct { float mouse[2]; - /* used incase we can't calculate the depth */ + /* Used in case we can't calculate the depth. */ float location_world[3]; float location_world_valid[3]; @@ -1053,7 +1053,7 @@ static int curve_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event) const bool is_modal = RNA_boolean_get(op->ptr, "wait_for_input"); - /* fallback (incase we can't find the depth on first test) */ + /* Fallback (in case we can't find the depth on first test). */ { const float mval_fl[2] = {UNPACK2(event->mval)}; float center[3]; diff --git a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c index d23965269ab..fa9c0f1fbb2 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c @@ -363,8 +363,8 @@ static void gizmo_arrow_exit(bContext *C, wmGizmo *gz, const bool cancel) const bool is_prop_valid = WM_gizmo_target_property_is_valid(gz_prop); if (!cancel) { - /* Assign incase applying the operation needs an updated offset - * editmesh bisect needs this. */ + /* Assign in case applying the operation needs an updated offset + * edit-mesh bisect needs this. */ if (is_prop_valid) { const int transform_flag = RNA_enum_get(arrow->gizmo.ptr, "transform"); const bool constrained = (transform_flag & ED_GIZMO_ARROW_XFORM_FLAG_CONSTRAINED) != 0; 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 e2a86469da1..406f76bc65e 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c @@ -358,7 +358,7 @@ static void gizmo_cage3d_draw_intern( bool show = false; if (gz->highlight_part == ED_GIZMO_CAGE3D_PART_TRANSLATE) { /* Only show if we're drawing the center handle - * otherwise the entire rectangle is the hotspot. */ + * otherwise the entire rectangle is the hot-spot. */ if (draw_options & ED_GIZMO_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE) { show = true; } diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 575e45565ff..f509be9312a 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -3331,7 +3331,7 @@ typedef enum eGP_ReprojectModes { GP_REPROJECT_FRONT = 0, GP_REPROJECT_SIDE, GP_REPROJECT_TOP, - /* On same plane, parallel to viewplane */ + /* On same plane, parallel to view-plane. */ GP_REPROJECT_VIEW, /* Reprojected on to the scene geometry */ GP_REPROJECT_SURFACE, @@ -3374,11 +3374,10 @@ static int gp_strokes_reproject_exec(bContext *C, wmOperator *op) for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) { float xy[2]; - /* 3D to Screenspace */ - /* Note: We can't use gp_point_to_xy() here because that uses ints for the screenspace - * coordinates, resulting in lost precision, which in turn causes stairstepping - * artifacts in the final points. - */ + /* 3D to Screen-space */ + /* Note: We can't use gp_point_to_xy() here because that uses ints for the screen-space + * coordinates, resulting in lost precision, which in turn causes stair-stepping + * artifacts in the final points. */ bGPDspoint pt2; gp_point_to_parent_space(pt, gpstroke_iter.diff_mat, &pt2); gp_point_to_xy_fl(&gsc, gps, &pt2, &xy[0], &xy[1]); @@ -3427,16 +3426,15 @@ static int gp_strokes_reproject_exec(bContext *C, wmOperator *op) /* apply parent again */ gp_apply_parent_point(depsgraph, ob, gpd, gpl, pt); } - /* Project screenspace back to 3D space (from current perspective) - * so that all points have been treated the same way - */ + /* Project screen-space back to 3D space (from current perspective) + * so that all points have been treated the same way. */ else if (mode == GP_REPROJECT_VIEW) { - /* Planar - All on same plane parallel to the viewplane */ + /* Planar - All on same plane parallel to the view-plane. */ gp_point_xy_to_3d(&gsc, scene, xy, &pt->x); } else { /* Geometry - Snap to surfaces of visible geometry */ - /* XXX: There will be precision loss (possible stairstep artifacts) + /* XXX: There will be precision loss (possible stair-step artifacts) * from this conversion to satisfy the API's */ const int screen_co[2] = {(int)xy[0], (int)xy[1]}; @@ -4440,7 +4438,7 @@ static int gpencil_cutter_lasso_select(bContext *C, if ((pt->flag & GP_SPOINT_SELECT) || (pt->flag & GP_SPOINT_TAG)) { continue; } - /* convert point coords to screenspace */ + /* convert point coords to screen-space */ const bool is_inside = is_inside_fn(gps, pt, &gsc, gpstroke_iter.diff_mat, user_data); if (is_inside) { tot_inside++; diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index f32fcffabd4..032fb7e4cc2 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -1844,7 +1844,7 @@ static void scroller_activate_init(bContext *C, */ scrollers = UI_view2d_scrollers_calc(v2d, NULL); - /* use a union of 'cur' & 'tot' incase the current view is far outside 'tot'. In this cases + /* Use a union of 'cur' & 'tot' in case the current view is far outside 'tot'. In this cases * moving the scroll bars has far too little effect and the view can get stuck T31476. */ tot_cur_union = v2d->tot; BLI_rctf_union(&tot_cur_union, &v2d->cur); diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index bb584094580..ab1595997e5 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -2949,7 +2949,7 @@ static int knifetool_modal(bContext *C, wmOperator *op, const wmEvent *event) case KNF_MODAL_ADD_CUT_CLOSED: if (kcd->mode == MODE_DRAGGING) { - /* shouldn't be possible with default key-layout, just incase... */ + /* Shouldn't be possible with default key-layout, just in case. */ if (kcd->is_drag_hold) { kcd->is_drag_hold = false; knifetool_update_mval(kcd, kcd->curr.mval); diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index dddc33e3ad0..326bbbd8770 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1116,7 +1116,7 @@ void ED_screen_full_prevspace(bContext *C, ScrArea *sa) void ED_screen_restore_temp_type(bContext *C, ScrArea *sa) { - /* incase nether functions below run */ + /* In case nether functions below run. */ ED_area_tag_redraw(sa); if (sa->flag & AREA_FLAG_TEMP_TYPE) { diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 42f502f6511..885cd1ee77d 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3742,7 +3742,7 @@ static int region_quadview_exec(bContext *C, wmOperator *op) rv3d->viewlock = 0; rv3d->rflag &= ~RV3D_CLIPPING; - /* accumulate locks, incase they're mixed */ + /* Accumulate locks, in case they're mixed. */ for (ar_iter = sa->regionbase.first; ar_iter; ar_iter = ar_iter->next) { if (ar_iter->regiontype == RGN_TYPE_WINDOW) { RegionView3D *rv3d_iter = ar_iter->regiondata; diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 342d0b6e820..397b2981ace 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -1719,9 +1719,9 @@ static float project_paint_uvpixel_mask(const ProjPaintState *ps, normalize_v3(no); } else { - /* incase the */ #if 1 - /* normalizing per pixel isn't optimal, we could cache or check ps->*/ + /* In case the normalizing per pixel isn't optimal, + * we could cache or access from evaluated mesh. */ normal_tri_v3(no, ps->mvert_eval[lt_vtri[0]].co, ps->mvert_eval[lt_vtri[1]].co, diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 9a9fe81a13e..b9adde6f60e 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -404,9 +404,7 @@ static void viewops_data_create(bContext *C, if (viewops_flag & VIEWOPS_FLAG_PERSP_ENSURE) { if (ED_view3d_persp_ensure(depsgraph, vod->v3d, vod->ar)) { /* If we're switching from camera view to the perspective one, - * need to tag viewport update, so camera vuew and borders - * are properly updated. - */ + * need to tag viewport update, so camera view and borders are properly updated. */ ED_region_tag_redraw(vod->ar); } } diff --git a/source/blender/editors/space_view3d/view3d_utils.c b/source/blender/editors/space_view3d/view3d_utils.c index 7f930f1d876..1af94e3ade5 100644 --- a/source/blender/editors/space_view3d/view3d_utils.c +++ b/source/blender/editors/space_view3d/view3d_utils.c @@ -622,8 +622,8 @@ bool ED_view3d_camera_autokey( /** * Call after modifying a locked view. * - * \note Not every view edit currently auto-keys (numpad for eg), - * this is complicated because of smoothview. + * \note Not every view edit currently auto-keys (num-pad for eg), + * this is complicated because of smooth-view. */ bool ED_view3d_camera_lock_autokey(View3D *v3d, RegionView3D *rv3d, diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 14995144c5c..6478928a6b6 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -6601,7 +6601,7 @@ static void slide_origdata_interp_data_vert(SlideOrigData *sod, * and we do not want to mess up other shape keys */ BM_loop_interp_from_face(bm, l, f_copy, false, false); - /* make sure face-attributes are correct (e.g. MTexPoly) */ + /* make sure face-attributes are correct (e.g. #MLoopUV, #MLoopCol) */ BM_elem_attrs_copy_ex(sod->bm_origfaces, bm, f_copy, l->f, 0x0, CD_MASK_NORMAL); /* weight the loop */ diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c index 6ebed88878f..e771fe43bd8 100644 --- a/source/blender/editors/transform/transform_input.c +++ b/source/blender/editors/transform/transform_input.c @@ -299,7 +299,7 @@ static void calcSpringFactor(MouseInput *mi) void initMouseInputMode(TransInfo *t, MouseInput *mi, MouseInputMode mode) { - /* incase we allocate a new value */ + /* In case we allocate a new value. */ void *mi_data_prev = mi->data; mi->use_virtual_mval = true; -- cgit v1.2.3