From 8765dfccf725770007e3b4e6b24199fe8377df71 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 21 Apr 2012 14:14:58 +0000 Subject: style cleanup: correct typos --- source/blender/blenkernel/intern/mesh_validate.c | 4 ++-- source/blender/blenlib/intern/math_color_inline.c | 2 +- source/blender/blenlib/intern/scanfill.c | 2 +- source/blender/bmesh/intern/bmesh_marking.c | 2 +- source/blender/bmesh/intern/bmesh_mesh.c | 2 +- source/blender/bmesh/operators/bmo_dissolve.c | 2 +- source/blender/bmesh/operators/bmo_extrude.c | 2 +- source/blender/bmesh/operators/bmo_inset.c | 2 +- source/blender/bmesh/operators/bmo_utils.c | 2 +- source/blender/editors/curve/editcurve.c | 2 +- source/blender/editors/interface/view2d.c | 2 +- source/blender/editors/mesh/editmesh_rip.c | 2 +- source/blender/editors/mesh/editmesh_tools.c | 2 +- source/blender/editors/screen/screen_edit.c | 2 +- source/blender/editors/sculpt_paint/sculpt.c | 2 +- source/blender/editors/util/undo.c | 2 +- source/blender/editors/uvedit/uvedit_ops.c | 2 +- source/blender/gpu/intern/gpu_extensions.c | 2 +- source/blender/gpu/intern/gpu_material.c | 4 ++-- source/blender/makesdna/DNA_key_types.h | 2 +- source/blender/makesdna/DNA_meshdata_types.h | 2 +- source/blender/makesrna/intern/rna_mesh.c | 4 ---- source/blender/windowmanager/intern/wm_operators.c | 2 +- 23 files changed, 24 insertions(+), 28 deletions(-) diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index c5c2060d5c0..aebbcd4208d 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -309,7 +309,7 @@ int BKE_mesh_validate_arrays(Mesh *mesh, prev_v = v; } } - if (v - prev_v > 1) { /* Don’t forget final verts! */ + if (v - prev_v > 1) { /* Don't forget final verts! */ PRINT(" poly %u is invalid, it multi-uses vertex %u (%u times)\n", sp->index, *prev_v, (int)(v - prev_v)); sp->invalid = TRUE; @@ -420,7 +420,7 @@ int BKE_mesh_validate_arrays(Mesh *mesh, /* DO NOT REMOVE ITS LOOPS!!! * As already invalid polys are at the end of the SortPoly list, the loops they * were the only users have already been tagged as "to remove" during previous - * iterations, and we don’t want to remove some loops that may be used by + * iterations, and we don't want to remove some loops that may be used by * another valid poly! */ } } diff --git a/source/blender/blenlib/intern/math_color_inline.c b/source/blender/blenlib/intern/math_color_inline.c index 1aebd8bda11..243e9fc8a57 100644 --- a/source/blender/blenlib/intern/math_color_inline.c +++ b/source/blender/blenlib/intern/math_color_inline.c @@ -78,7 +78,7 @@ MINLINE void linearrgb_to_srgb_uchar4(unsigned char srgb[4], const float linear[ F4TOCHAR4(srgb_f, srgb); } -/* predivide versions to work on associated/premultipled alpha. if this should +/* predivide versions to work on associated/pre-multipled alpha. if this should * be done or not depends on the background the image will be composited over, * ideally you would never do color space conversion on an image with alpha * because it is ill defined */ diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c index 20dbf29f6bc..25850e14ae7 100644 --- a/source/blender/blenlib/intern/scanfill.c +++ b/source/blender/blenlib/intern/scanfill.c @@ -897,7 +897,7 @@ int BLI_edgefill_ex(ScanFillContext *sf_ctx, const short do_quad_tri_speedup, co /* get first vertex with no poly number */ if (eve->poly_nr == 0) { poly++; - /* now a sortof select connected */ + /* now a sort of select connected */ ok = 1; eve->poly_nr = poly; diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c index 7b6d562658e..b0a39326fe8 100644 --- a/source/blender/bmesh/intern/bmesh_marking.c +++ b/source/blender/bmesh/intern/bmesh_marking.c @@ -854,7 +854,7 @@ void BM_mesh_elem_hflag_enable_test(BMesh *bm, const char htype, const char hfla /* note, better not attempt a fast path for selection as done with de-select * because hidden geometry and different selection modes can give different results, - * we could ofcourse check for no hiddent faces and then use quicker method but its not worth it. */ + * we could of course check for no hiddent faces and then use quicker method but its not worth it. */ for (i = 0; i < 3; i++) { if (htype & flag_types[i]) { diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index 454ab58d720..0a5e3bab804 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -718,7 +718,7 @@ void BM_mesh_remap(BMesh *bm, int *vert_idx, int *edge_idx, int *face_idx) } } - /* Edges' pointers, only vert pointers (as we don’t mess with loops!)... */ + /* Edges' pointers, only vert pointers (as we don't mess with loops!)... */ if (vptr_map) { BM_ITER_MESH (ed, &iter, bm, BM_EDGES_OF_MESH) { /* printf("Edge v1: %p -> %p\n", ed->v1, BLI_ghash_lookup(vptr_map, (const void*)ed->v1));*/ diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index f0e8ad81d07..a6d9d26f7ae 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -294,7 +294,7 @@ static int test_extra_verts(BMesh *bm, BMVert *v) BMEdge *e; int found; - /* test faces around verts for verts that would be wronly killed + /* test faces around verts for verts that would be wrongly killed * by dissolve faces. */ f = BM_iter_new(&iter, bm, BM_FACES_OF_VERT, v); for ( ; f; f = BM_iter_step(&iter)) { diff --git a/source/blender/bmesh/operators/bmo_extrude.c b/source/blender/bmesh/operators/bmo_extrude.c index 73997c774af..db665c06f82 100644 --- a/source/blender/bmesh/operators/bmo_extrude.c +++ b/source/blender/bmesh/operators/bmo_extrude.c @@ -134,7 +134,7 @@ static void bm_extrude_copy_face_loop_attributes(BMesh *bm, BMFace *f, BMEdge *e BMLoop *l_dst_a = BM_face_edge_share_loop(f, e_a); BMLoop *l_dst_b = BM_face_edge_share_loop(f, e_b); /* we could only have a face on one-or the other edges, - * chech if either side of the face has an adjacent face */ + * check if either side of the face has an adjacent face */ BMLoop *l_src_1; BMLoop *l_src_2; diff --git a/source/blender/bmesh/operators/bmo_inset.c b/source/blender/bmesh/operators/bmo_inset.c index c6fc173148f..1e131fa4b7b 100644 --- a/source/blender/bmesh/operators/bmo_inset.c +++ b/source/blender/bmesh/operators/bmo_inset.c @@ -362,7 +362,7 @@ void bmo_inset_exec(BMesh *bm, BMOperator *op) * | | * * note, the fact we are doing location comparisons on verts that are moved about - * doesn’t matter because the direction will remain the same in this case. + * doesn't matter because the direction will remain the same in this case. */ BMEdge *e_other; diff --git a/source/blender/bmesh/operators/bmo_utils.c b/source/blender/bmesh/operators/bmo_utils.c index 87aba98836d..818eedffc00 100644 --- a/source/blender/bmesh/operators/bmo_utils.c +++ b/source/blender/bmesh/operators/bmo_utils.c @@ -461,7 +461,7 @@ void bmo_vertexsmooth_exec(BMesh *bm, BMOperator *op) /* * compute the fake surface of an ngon * This is done by decomposing the ngon into triangles who share the centroid of the ngon - * while this method is far from being exact, it should garantee an invariance. + * while this method is far from being exact, it should guarantee an invariance. * * NOTE: This should probably go to bmesh_polygon.c */ diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 775b28bab5b..4262b3d67d4 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -4395,7 +4395,7 @@ static int addvert_Nurb(bContext *C, short mode, float location[3]) newnu= (Nurb*)MEM_callocN(sizeof(Nurb), "addvert_Nurb newnu"); if (!nu) { - /* no selected sement -- create new one which is BEZIER tpye + /* no selected segment -- create new one which is BEZIER type * type couldn't be determined from Curve bt could be changed * in the future, so shouldn't make much headache */ newnu->type= CU_BEZIER; diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 7eac3050b97..ed010dc973a 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -159,7 +159,7 @@ static void view2d_masks(View2D *v2d) /* Initialize all relevant View2D data (including view rects if first time) and/or refresh mask sizes after view resize * - for some of these presets, it is expected that the region will have defined some - * additional settings necessary for the customisation of the 2D viewport to its requirements + * additional settings necessary for the customization of the 2D viewport to its requirements * - this function should only be called from region init() callbacks, where it is expected that * this is called before UI_view2d_size_update(), as this one checks that the rects are properly initialized. */ diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 946eaf8d3c8..fbbe376a18f 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -635,7 +635,7 @@ static int edbm_rip_invoke__edge(bContext *C, wmOperator *op, wmEvent *event) BMLoop *l_a = e2->l; BMLoop *l_b = l_a->radial_next; - /* find the best face to follow, this wat the edge won't point away from + /* find the best face to follow, this what the edge won't point away from * the mouse when there are more then 4 (takes the shortest face fan around) */ l = (edbm_rip_edge_side_measure(e2, l_a, ar, projectMat, fmval) < edbm_rip_edge_side_measure(e2, l_b, ar, projectMat, fmval)) ? l_a : l_b; diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 4b064d8bcc6..e40a60203af 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -3624,7 +3624,7 @@ void MESH_OT_select_mirror(wmOperatorType *ot) /* qsort routines. not sure how to make these * work, since we aren't using linked lists for - * geometry anymore. might need a sortof "swap" + * geometry anymore. might need a sort of "swap" * function for bmesh elements. */ /* TODO All this section could probably use a refresh... diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 1b56feb09d1..03d8b3d3e9c 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1827,7 +1827,7 @@ void ED_update_for_newframe(Main *bmain, Scene *scene, bScreen *screen, int UNUS //extern void audiostream_scrub(unsigned int frame); /* seqaudio.c */ /* update animated image textures for gpu, etc, - * call before scene_update_for_newframe so modifiers with textuers don't lag 1 frame */ + * call before scene_update_for_newframe so modifiers with textures don't lag 1 frame */ ED_image_update_frame(bmain, scene->r.cfra); ED_clip_update_frame(bmain, scene->r.cfra); diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index bee4f0b754d..5a64c30b79d 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -3041,7 +3041,7 @@ static void sculpt_update_cache_variants(bContext *C, Sculpt *sd, Object *ob, cache->pen_flip = RNA_boolean_get(ptr, "pen_flip"); RNA_float_get_array(ptr, "mouse", cache->mouse); - /* XXX: Use preassure value from first brush step for brushes which don't + /* XXX: Use pressure value from first brush step for brushes which don't * support strokes (grab, thumb). They depends on initial state and * brush coord/pressure/etc. * It's more an events design issue, which doesn't split coordinate/pressure/angle diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c index 5f0fc9d105c..a43d549cba1 100644 --- a/source/blender/editors/util/undo.c +++ b/source/blender/editors/util/undo.c @@ -459,7 +459,7 @@ static EnumPropertyItem *rna_undo_itemf(bContext *C, int undosys, int *totitem) if (name) { item_tmp.identifier = name; - /* XXX This won’t work with non-default contexts (e.g. operators) :/ */ + /* XXX This won't work with non-default contexts (e.g. operators) :/ */ item_tmp.name = IFACE_(name); if (active) item_tmp.icon = ICON_RESTRICT_VIEW_OFF; diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 969fa684c80..a53a42b616b 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -1510,7 +1510,7 @@ static void weld_align_uv(bContext *C, int tool) /* Projection of point (x, y) over line (x1, y1, x2, y2) along X axis: * new_y = (y2 - y1) / (x2 - x1) * (x - x1) + y1 * Maybe this should be a BLI func? Or is it already existing? - * Could use interp_v2_v2v2, but not sure it’s worth it here...*/ + * Could use interp_v2_v2v2, but not sure it's worth it here...*/ if (tool == 't') luv->uv[0] = a * (luv->uv[1] - uv_start[1]) + uv_start[0]; else if (tool == 'u') diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index 605b2d8901e..6c30c95f355 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -59,7 +59,7 @@ /* extensions used: * - texture border clamp: 1.3 core - * - fragement shader: 2.0 core + * - fragment shader: 2.0 core * - framebuffer object: ext specification * - multitexture 1.3 core * - arb non power of two: 2.0 core diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 56bee29e436..ab5f2040175 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -1830,8 +1830,8 @@ GPUShaderExport *GPU_shader_export(struct Scene *scene, struct Material *ma) } } - // now link fragement shader with library shader - // TBD: remove the function that are not used in the main function + /* now link fragment shader with library shader */ + /* TBD: remove the function that are not used in the main function */ liblen = (pass->libcode) ? strlen(pass->libcode) : 0; fraglen = strlen(pass->fragmentcode); shader->fragment = (char *)MEM_mallocN(liblen+fraglen+1, "GPUFragShader"); diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h index 847d0b2cbbe..8494e663fbe 100644 --- a/source/blender/makesdna/DNA_key_types.h +++ b/source/blender/makesdna/DNA_key_types.h @@ -52,7 +52,7 @@ typedef struct KeyBlock { short relative; /* relative == 0 means first key is reference, otherwise the index of Key->blocks */ short flag; - int totelem; /* total number if items in the keyblock (compare with mesh/curve verts to chech we match) */ + int totelem; /* total number if items in the keyblock (compare with mesh/curve verts to check we match) */ int uid; /* for meshes only, match the unique number with the customdata layer */ void *data; /* array of shape key values, size is (Key->elemsize * KeyBlock->totelem) */ diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index 2de89a31ab0..9891469c29b 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -257,7 +257,7 @@ typedef struct MRecast { /* medge->flag (1=SELECT)*/ #define ME_EDGEDRAW (1<<1) #define ME_SEAM (1<<2) -#define ME_FGON (1<<3) +/* #define ME_FGON (1<<3) */ /* no longer used (now we have ngons) */ /* reserve 16 for ME_HIDE */ #define ME_EDGERENDER (1<<5) #define ME_LOOSEEDGE (1<<7) diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 8e1457499ca..d6c240b29c1 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1433,10 +1433,6 @@ static void rna_def_medge(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_LOOSEEDGE); RNA_def_property_ui_text(prop, "Loose", "Loose edge"); - prop = RNA_def_property(srna, "is_fgon", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_FGON); - RNA_def_property_ui_text(prop, "Fgon", "Fgon edge"); - prop = RNA_def_property(srna, "index", PROP_INT, PROP_UNSIGNED); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_int_funcs(prop, "rna_MeshEdge_index_get", NULL, NULL); diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 028f7b5c41f..70feccad94a 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2240,7 +2240,7 @@ static int wm_console_toggle_op(bContext *UNUSED(C), wmOperator *UNUSED(op)) static void WM_OT_console_toggle(wmOperatorType *ot) { /* XXX Have to mark these for xgettext, as under linux they do not exists... - * And even worth, have to give the context as text, as xgettext doesn’t expand macros. :( */ + * And even worth, have to give the context as text, as xgettext doesn't expand macros. :( */ ot->name = CTX_N_("Operator"/* BLF_I18NCONTEXT_OPERATOR_DEFAULT */, "Toggle System Console"); ot->idname = "WM_OT_console_toggle"; ot->description = N_("Toggle System Console"); -- cgit v1.2.3