From 5e347c4f71bf220bb735e8f9b9b965ce8644d77c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 26 May 2013 12:02:29 +0000 Subject: code cleanup: typos --- source/blender/avi/AVI_avi.h | 2 +- source/blender/blenkernel/intern/anim_sys.c | 2 +- source/blender/blenkernel/intern/constraint.c | 2 +- source/blender/blenkernel/intern/nla.c | 2 +- source/blender/bmesh/intern/bmesh_construct.c | 7 ++++--- source/blender/bmesh/tools/bmesh_bevel.c | 2 +- source/blender/editors/animation/keyframes_general.c | 3 ++- source/blender/editors/interface/view2d_ops.c | 12 ++++++------ source/blender/editors/space_view3d/view3d_edit.c | 2 +- source/blender/editors/space_view3d/view3d_project.c | 2 +- source/blender/makesdna/DNA_anim_types.h | 2 +- 11 files changed, 20 insertions(+), 18 deletions(-) (limited to 'source/blender') diff --git a/source/blender/avi/AVI_avi.h b/source/blender/avi/AVI_avi.h index 4dc52970119..7c217c9223d 100644 --- a/source/blender/avi/AVI_avi.h +++ b/source/blender/avi/AVI_avi.h @@ -257,7 +257,7 @@ AviError AVI_set_compress_option(AviMovie *movie, int stream, AviOption option, void *opt_data); -/* Hmmm... there should be some explanantion about what these mean */ +/* Hmmm... there should be some explanation about what these mean */ /** * Compression option, for use in avi_set_compress_option */ diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index cdf0c032372..3e85c5503f1 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -2296,7 +2296,7 @@ void BKE_animsys_evaluate_animdata(Scene *scene, ID *id, AnimData *adt, float ct * - Overrides allow editing, by overwriting the value(s) set from animation-data, with the * value last set by the user (and not keyframed yet). * - Overrides are cleared upon frame change and/or keyframing - * - It is best that we execute this everytime, so that no errors are likely to occur. + * - It is best that we execute this every time, so that no errors are likely to occur. */ animsys_evaluate_overrides(&id_ptr, adt); diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index cee796c4cab..7c378a60a2b 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -4711,7 +4711,7 @@ void BKE_get_constraint_targets_for_solving(bConstraint *con, bConstraintOb *cob /* ---------- Evaluation ----------- */ /* This function is called whenever constraints need to be evaluated. Currently, all - * constraints that can be evaluated are everytime this gets run. + * constraints that can be evaluated are every time this gets run. * * BKE_constraints_make_evalob and BKE_constraints_clear_evalob should be called before and * after running this function, to sort out cob diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 90fdbc5710d..7b5b6a28421 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -1350,7 +1350,7 @@ void BKE_nlastrip_validate_name(AnimData *adt, NlaStrip *strip) } /* build a hash-table of all the strips in the tracks - * - this is easier than iterating over all the tracks+strips hierarchy everytime + * - this is easier than iterating over all the tracks+strips hierarchy every time * (and probably faster) */ gh = BLI_ghash_str_new("nlastrip_validate_name gh"); diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 3a6150e65c5..15030f90c65 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -691,7 +691,7 @@ void BMO_remove_tagged_context(BMesh *bm, const short oflag, const int type) } case DEL_FACES: { - /* go through and mark all edges and all verts of all faces for delet */ + /* go through and mark all edges and all verts of all faces for delete */ BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) { if (BMO_elem_flag_test(bm, f, oflag)) { for (e = BM_iter_new(&eiter, bm, BM_EDGES_OF_FACE, f); e; e = BM_iter_step(&eiter)) @@ -847,7 +847,7 @@ void BM_elem_attrs_copy(BMesh *source_mesh, BMesh *target_mesh, const void *sour } } -/* helper functioon for 'BM_mesh_copy' */ +/* helper function for 'BM_mesh_copy' */ static BMFace *bm_mesh_copy_new_face(BMesh *bm_new, BMesh *bm_old, BMVert **vtable, BMEdge **etable, BMFace *f) @@ -923,7 +923,8 @@ BMesh *BM_mesh_copy(BMesh *bm_old) ftable = MEM_mallocN(sizeof(BMFace *) * bm_old->totface, "BM_mesh_copy ftable"); BM_ITER_MESH_INDEX (v, &iter, bm_old, BM_VERTS_OF_MESH, i) { - v_new = BM_vert_create(bm_new, v->co, NULL, BM_CREATE_SKIP_CD); /* copy between meshes so cant use 'example' argument */ + /* copy between meshes so cant use 'example' argument */ + v_new = BM_vert_create(bm_new, v->co, NULL, BM_CREATE_SKIP_CD); BM_elem_attrs_copy(bm_old, bm_new, v, v_new); vtable[i] = v_new; BM_elem_index_set(v, i); /* set_inline */ diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 1c8c618ed9a..6b5e18ceb61 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -99,7 +99,7 @@ typedef struct VMesh { M_ADJ, /* "adjacent edges" mesh pattern */ M_ADJ_SUBDIV, /* like M_ADJ, but using subdivision */ M_TRI_FAN, /* a simple polygon - fan filled */ - M_QUAD_STRIP, /* a simple polygon - cut into paralelle strips */ + M_QUAD_STRIP, /* a simple polygon - cut into parallel strips */ } mesh_kind; // int _pad; } VMesh; diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index 9249b912da6..2cb2f6683ef 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -541,7 +541,8 @@ short copy_animedit_keys(bAnimContext *ac, ListBase *anim_data) BLI_addtail(&animcopybuf, aci); /* add selected keyframes to buffer */ - // TODO: currently, we resize array everytime we add a new vert - this works ok as long as it is assumed only a few keys are copied + /* TODO: currently, we resize array every time we add a new vert - + * this works ok as long as it is assumed only a few keys are copied */ for (i = 0, bezt = fcu->bezt; i < fcu->totvert; i++, bezt++) { if (BEZSELECTED(bezt)) { /* add to buffer */ diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index e283bd1351a..e12817262f8 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -312,7 +312,7 @@ static void VIEW2D_OT_pan(wmOperatorType *ot) /* ------------------ Scrollwheel Versions (2) ---------------------- */ -/* this operator only needs this single callback, where it callsthe view_pan_*() methods */ +/* this operator only needs this single callback, where it calls the view_pan_*() methods */ static int view_scrollright_exec(bContext *C, wmOperator *op) { v2dViewPanData *vpd; @@ -356,7 +356,7 @@ static void VIEW2D_OT_scroll_right(wmOperatorType *ot) -/* this operator only needs this single callback, where it callsthe view_pan_*() methods */ +/* this operator only needs this single callback, where it calls the view_pan_*() methods */ static int view_scrollleft_exec(bContext *C, wmOperator *op) { v2dViewPanData *vpd; @@ -399,7 +399,7 @@ static void VIEW2D_OT_scroll_left(wmOperatorType *ot) } -/* this operator only needs this single callback, where it callsthe view_pan_*() methods */ +/* this operator only needs this single callback, where it calls the view_pan_*() methods */ static int view_scrolldown_exec(bContext *C, wmOperator *op) { v2dViewPanData *vpd; @@ -449,7 +449,7 @@ static void VIEW2D_OT_scroll_down(wmOperatorType *ot) -/* this operator only needs this single callback, where it callsthe view_pan_*() methods */ +/* this operator only needs this single callback, where it calls the view_pan_*() methods */ static int view_scrollup_exec(bContext *C, wmOperator *op) { v2dViewPanData *vpd; @@ -738,7 +738,7 @@ static void VIEW2D_OT_zoom_in(wmOperatorType *ot) RNA_def_float(ot->srna, "zoomfacy", 0, -FLT_MAX, FLT_MAX, "Zoom Factor Y", "", -FLT_MAX, FLT_MAX); } -/* this operator only needs this single callback, where it callsthe view_zoom_*() methods */ +/* this operator only needs this single callback, where it calls the view_zoom_*() methods */ static int view_zoomout_exec(bContext *C, wmOperator *op) { ScrArea *sa = CTX_wm_area(C); @@ -1175,7 +1175,7 @@ static int view_borderzoom_exec(bContext *C, wmOperator *op) */ float zoom, center, size; - /* TODO: is this zoom factor calculation valid? It seems to produce same results everytime... */ + /* TODO: is this zoom factor calculation valid? It seems to produce same results every time... */ if ((v2d->keepzoom & V2D_LOCKZOOM_X) == 0) { size = BLI_rctf_size_x(&cur_new); zoom = size / BLI_rctf_size_x(&rect); diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index bc9b1e339c6..63d533fb494 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -682,7 +682,7 @@ static void viewrotate_apply(ViewOpsData *vod, int x, int y) { RegionView3D *rv3d = vod->rv3d; - rv3d->view = RV3D_VIEW_USER; /* need to reset everytime because of view snapping */ + rv3d->view = RV3D_VIEW_USER; /* need to reset every time because of view snapping */ if (U.flag & USER_TRACKBALL) { float phi, si, q1[4], dvec[3], newvec[3]; diff --git a/source/blender/editors/space_view3d/view3d_project.c b/source/blender/editors/space_view3d/view3d_project.c index 291070d9145..00826d277bd 100644 --- a/source/blender/editors/space_view3d/view3d_project.c +++ b/source/blender/editors/space_view3d/view3d_project.c @@ -410,7 +410,7 @@ void ED_view3d_win_to_3d(const ARegion *ar, const float depth_pt[3], const float add_v3_v3v3(line_end, line_sta, mousevec); if (isect_line_plane_v3(out, line_sta, line_end, depth_pt, rv3d->viewinv[2], true) == 0) { - /* highly unlikely to ever happen, mouse vec paralelle with view plane */ + /* highly unlikely to ever happen, mouse vector parallel with view plane */ zero_v3(out); } } diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index 73e2a9f433b..fc0dd54a8e7 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -275,7 +275,7 @@ typedef struct DriverTarget { char pchan_name[32]; /* name of the posebone to use (for vars where DTAR_FLAG_STRUCT_REF is used) */ short transChan; /* transform channel index (for DVAR_TYPE_TRANSFORM_CHAN)*/ - short flag; /* flags for the validity of the target (NOTE: these get reset everytime the types change) */ + short flag; /* flags for the validity of the target (NOTE: these get reset every time the types change) */ int idtype; /* type of ID-block that this target can use */ } DriverTarget; -- cgit v1.2.3