diff options
235 files changed, 512 insertions, 511 deletions
diff --git a/intern/boolop/intern/BOP_Triangulator.cpp b/intern/boolop/intern/BOP_Triangulator.cpp index ca1e3ad2b6b..65f7dae1c0c 100644 --- a/intern/boolop/intern/BOP_Triangulator.cpp +++ b/intern/boolop/intern/BOP_Triangulator.cpp @@ -173,7 +173,7 @@ void BOP_triangulateC(BOP_Mesh* mesh, BOP_Faces* faces, BOP_Face* face, BOP_Inde /** * Triangulates the face (v1,v2,v3) in five new faces by two inner points (v4,v5), where - * v1 v4 v5 defines the nice triangle and v4 v5 v2 v3 defines the quad to be tesselated. + * v1 v4 v5 defines the nice triangle and v4 v5 v2 v3 defines the quad to be tessellated. * @param mesh mesh that contains the faces, edges and vertices * @param faces set of faces that contains face and will contains new faces * @param face input face to be triangulate diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt index 85552508bb9..db92cf4ef54 100644 --- a/intern/cycles/render/CMakeLists.txt +++ b/intern/cycles/render/CMakeLists.txt @@ -16,7 +16,7 @@ set(SRC buffers.cpp camera.cpp film.cpp - # film_response.cpp # XXX, why isnt this in? + # film_response.cpp # XXX, why isn't this in? filter.cpp graph.cpp image.cpp @@ -41,7 +41,7 @@ set(SRC_HEADERS buffers.h camera.h film.h - # film_response.h # XXX, why isnt this in? + # film_response.h # XXX, why isn't this in? filter.h graph.h image.h diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index f8825bab66c..97ac3008072 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -65,7 +65,7 @@ // #define DEBUG_MEMCOUNTER #ifdef DEBUG_MEMCOUNTER -#define DEBUG_MEMCOUNTER_ERROR_VAL 0 /* set this to the value that isnt being freed */ +#define DEBUG_MEMCOUNTER_ERROR_VAL 0 /* set this to the value that isn't being freed */ static int _mallocn_count = 0; /* breakpoint here */ diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h index 334d356f6f9..911a94cb56a 100644 --- a/source/blender/blenfont/BLF_api.h +++ b/source/blender/blenfont/BLF_api.h @@ -185,6 +185,6 @@ void BLF_dir_free(char **dirs, int count); /* XXX, bad design */ extern int blf_mono_font; -extern int blf_mono_font_render; /* dont mess drawing with render threads. */ +extern int blf_mono_font_render; /* don't mess drawing with render threads. */ #endif /* __BLF_API_H__ */ diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index 69259aa6719..84cefc923a0 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -260,7 +260,7 @@ void blf_font_buffer(FontBLF *font, const char *str) } if ((chx + g->width) >= 0 && chx < font->bw && (pen_y + g->height) >= 0 && pen_y < font->bh) { - /* dont draw beyond the buffer bounds */ + /* don't draw beyond the buffer bounds */ int width_clip = g->width; int height_clip = g->height; int yb_start = g->pitch < 0 ? 0 : g->height-1; diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index e90646c72ee..493a5ec285f 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -98,7 +98,7 @@ struct PBVH; #define SUB_ELEMS_FACE 50 /* - * Note: all mface interfaces now officially operate on tesselated data. + * Note: all mface interfaces now officially operate on tessellated data. * Also, the mface origindex layer indexes mpolys, not mfaces. */ @@ -174,7 +174,7 @@ struct DerivedMesh { int (*getNumLoops)(DerivedMesh *dm); int (*getNumPolys)(DerivedMesh *dm); - /* copy a single vert/edge/tesselated face from the derived mesh into + /* copy a single vert/edge/tessellated face from the derived mesh into * *{vert/edge/face}_r. note that the current implementation * of this function can be quite slow, iterating over all * elements (editmesh) diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h index fed200d7be0..bdfe7366f9e 100644 --- a/source/blender/blenkernel/BKE_cdderivedmesh.h +++ b/source/blender/blenkernel/BKE_cdderivedmesh.h @@ -76,7 +76,7 @@ struct DerivedMesh *CDDM_copy_from_tessface(struct DerivedMesh *dm); /* creates a CDDerivedMesh with the same layer stack configuration as the * given DerivedMesh and containing the requested numbers of elements. - * elements are initialised to all zeros + * elements are initialized to all zeros */ struct DerivedMesh *CDDM_from_template(struct DerivedMesh *source, int numVerts, int numEdges, int numFaces, @@ -103,7 +103,7 @@ void CDDM_calc_normals_tessface(struct DerivedMesh *dm); /* calculates edges for a CDDerivedMesh (from face data) * this completely replaces the current edge data in the DerivedMesh - * builds edges from the tesselated face data. + * builds edges from the tessellated face data. */ void CDDM_calc_edges_tessface(struct DerivedMesh *dm); diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index 27b27ce5b42..a22182a52f5 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -73,10 +73,11 @@ extern const CustomDataMask CD_MASK_FACECORNERS; #define CD_TYPE_AS_MASK(_type) (CustomDataMask)((CustomDataMask)1 << (CustomDataMask)(_type)) -/* Checks if the layer at physical offset layern (in data->layers) support math +/** + * Checks if the layer at physical offset \a layer_n (in data->layers) support math * the below operations. */ -int CustomData_layer_has_math(struct CustomData *data, int layern); +int CustomData_layer_has_math(struct CustomData *data, int layer_n); /* copies the "value" (e.g. mloopuv uv or mloopcol colors) from one block to * another, while not overwriting anything else (e.g. flags). probably only diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index f5937304e76..971320765e9 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -109,7 +109,7 @@ void object_boundbox_flag(struct Object *ob, int flag, int set); void minmax_object(struct Object *ob, float min[3], float max[3]); int minmax_object_duplis(struct Scene *scene, struct Object *ob, float min[3], float max[3]); -/* sometimes min-max isnt enough, we need to loop over each point */ +/* sometimes min-max isn't enough, we need to loop over each point */ void BKE_object_foreach_display_point( struct Object *ob, float obmat[4][4], void (*func_cb)(const float[3], void *), void *user_data); diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h index 446084053de..626dd64e21e 100644 --- a/source/blender/blenkernel/BKE_shrinkwrap.h +++ b/source/blender/blenkernel/BKE_shrinkwrap.h @@ -90,7 +90,7 @@ void space_transform_invert(const struct SpaceTransform *data, float *co); * - Normal projection * * ShrinkwrapCalcData encapsulates all needed data for shrinkwrap functions. - * (So that you dont have to pass an enormous amount of arguments to functions) + * (So that you don't have to pass an enormous amount of arguments to functions) */ struct Object; diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 99629a2e27b..906733d1f26 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1946,8 +1946,8 @@ static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, D /* --- */ /* BMESH_ONLY, ensure tessface's used for drawing, - * but dont recalculate if the last modifier in the stack gives us tessfaces - * check if the derived meshes are DM_TYPE_EDITBMESH before calling, this isnt essential + * but don't recalculate if the last modifier in the stack gives us tessfaces + * check if the derived meshes are DM_TYPE_EDITBMESH before calling, this isn't essential * but quiets annoying error messages since tessfaces wont be created. */ if ((*final_r)->type != DM_TYPE_EDITBMESH) { DM_ensure_tessface(*final_r); diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index b1b98c030eb..dcd4a712dbb 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -1054,7 +1054,7 @@ short action_get_item_transforms (bAction *act, Object *ob, bPoseChannel *pchan, /* Copy the data from the action-pose (src) into the pose */ /* both args are assumed to be valid */ /* exported to game engine */ -/* Note! this assumes both poses are aligned, this isnt always true when dealing with user poses */ +/* Note! this assumes both poses are aligned, this isn't always true when dealing with user poses */ void extract_pose_from_pose(bPose *pose, const bPose *src) { const bPoseChannel *schan; diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index a8644618945..30f4e9f2816 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -373,7 +373,7 @@ int BKE_read_file(bContext *C, const char *filepath, ReportList *reports) BlendFileData *bfd; int retval= BKE_READ_FILE_OK; - if(strstr(filepath, BLENDER_STARTUP_FILE)==NULL) /* dont print user-pref loading */ + if(strstr(filepath, BLENDER_STARTUP_FILE)==NULL) /* don't print user-pref loading */ printf("read blend: %s\n", filepath); bfd= BLO_read_from_file(filepath, reports); diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index bbe210f2ce6..167104e1da9 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -545,7 +545,7 @@ BVHTree* bvhtree_from_mesh_faces(BVHTreeFromMesh *data, DerivedMesh *mesh, float /* Insert BMesh-tessellation triangles into the bvh tree, unless they are hidden * and/or selected. Even if the faces themselves are not selected for the snapped - * transform, having a vertex selected means the face (and thus it's tesselated + * transform, having a vertex selected means the face (and thus it's tessellated * triangles) will be moving and will not be a good snap targets.*/ for (i = 0; i < em->tottri; i++) { BMLoop **tri = em->looptris[i]; @@ -554,12 +554,12 @@ BVHTree* bvhtree_from_mesh_faces(BVHTreeFromMesh *data, DerivedMesh *mesh, float BMIter iter; int insert; - /* Each loop of the triangle points back to the BMFace it was tesselated from. + /* Each loop of the triangle points back to the BMFace it was tessellated from. * All three should point to the same face, so just use the face from the first * loop.*/ f = tri[0]->f; - /* If the looptris is ordered such that all triangles tesselated from a single + /* If the looptris is ordered such that all triangles tessellated from a single * faces are consecutive elements in the array, then we could speed up the tests * below by using the insert value from the previous iteration.*/ @@ -567,14 +567,14 @@ BVHTree* bvhtree_from_mesh_faces(BVHTreeFromMesh *data, DerivedMesh *mesh, float insert = 1; if (BM_elem_flag_test(f, BM_ELEM_SELECT) || BM_elem_flag_test(f, BM_ELEM_HIDDEN)) { - /* Don't insert triangles tesselated from faces that are hidden + /* Don't insert triangles tessellated from faces that are hidden * or selected*/ insert = 0; } else { BM_ITER(v, &iter, em->bm, BM_VERTS_OF_FACE, f) { if (BM_elem_flag_test(v, BM_ELEM_SELECT)) { - /* Don't insert triangles tesselated from faces that have + /* Don't insert triangles tessellated from faces that have * any selected verts.*/ insert = 0; } diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index f55ceab7de8..7180d157b96 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -465,7 +465,7 @@ static void camera_to_frame_view_cb(const float co[3], void *user_data) data->tot++; } -/* dont move the camera, just yield the fit location */ +/* don't move the camera, just yield the fit location */ /* only valid for perspective cameras */ int camera_view_frame_fit_to_scene(Scene *scene, struct View3D *v3d, Object *camera_ob, float r_co[3]) { diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index afde9d806c6..85620faf993 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1193,7 +1193,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, } } else { - /* if the buffer was set, dont use it again. + /* if the buffer was set, don't use it again. * prevdraw was assumed true but didnt run so set to false - [#21036] */ /* prevdraw= 0; */ /* UNUSED */ buffer= NULL; diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index e0125891e86..666a5cf3054 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -4575,7 +4575,7 @@ void copy_constraints (ListBase *dst, const ListBase *src, int do_extern) if (cti->copy_data) cti->copy_data(con, srccon); - /* for proxies we dont want to make extern */ + /* for proxies we don't want to make extern */ if (do_extern) { /* go over used ID-links for this constraint to ensure that they are valid for proxies */ if (cti->id_looper) diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 1387b2be884..e4709e37316 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -2313,9 +2313,9 @@ void *CustomData_bmesh_get_layer_n(const CustomData *data, void *block, int n) return (char *)block + data->layers[n].offset; } -int CustomData_layer_has_math(struct CustomData *data, int layern) +int CustomData_layer_has_math(struct CustomData *data, int layer_n) { - const LayerTypeInfo *typeInfo = layerType_getInfo(data->layers[layern].type); + const LayerTypeInfo *typeInfo = layerType_getInfo(data->layers[layer_n].type); if (typeInfo->equal && typeInfo->add && typeInfo->multiply && typeInfo->initminmax && typeInfo->dominmax) return 1; diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index 6158d2f8608..e5f2d152edf 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -416,7 +416,7 @@ void defgroup_unique_name(bDeformGroup *dg, Object *ob) /* finds the best possible flipped name. For renaming; check for unique names afterwards */ /* if strip_number: removes number extensions - * note: dont use sizeof() for 'name' or 'from_name' */ + * note: don't use sizeof() for 'name' or 'from_name' */ void flip_side_name(char name[MAX_VGROUP_NAME], const char from_name[MAX_VGROUP_NAME], int strip_number) { int len; @@ -540,8 +540,8 @@ float defvert_find_weight(const struct MDeformVert *dvert, const int defgroup) } /* take care with this the rationale is: - * - if the object has no vertex group. act like vertex group isnt set and return 1.0, - * - if the vertex group exists but the 'defgroup' isnt found on this vertex, _still_ return 0.0 + * - if the object has no vertex group. act like vertex group isn't set and return 1.0, + * - if the vertex group exists but the 'defgroup' isn't found on this vertex, _still_ return 0.0 * * This is a bit confusing, just saves some checks from the caller. */ @@ -645,7 +645,7 @@ void defvert_remove_group(MDeformVert *dvert, MDeformWeight *dw) if (dvert->totweight) { dw_new = MEM_mallocN(sizeof(MDeformWeight)*(dvert->totweight), __func__); if (dvert->dw) { -#if 1 /* since we dont care about order, swap this with the last, save a memcpy */ +#if 1 /* since we don't care about order, swap this with the last, save a memcpy */ if (i != dvert->totweight) { dvert->dw[i]= dvert->dw[dvert->totweight]; } diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index a778a457976..a1b1da32af7 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -708,7 +708,7 @@ static ModifierData *curve_get_tesselate_point(Scene *scene, Object *ob, int for preTesselatePoint = md; /* this modifiers are moving point of tessellation automatically - * (some of them even can't be applied on tesselated curve), set flag + * (some of them even can't be applied on tessellated curve), set flag * for incformation button in modifier's header */ md->mode |= eModifierMode_ApplyOnSpline; } else if(md->mode&eModifierMode_ApplyOnSpline) { diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index ea3e31de75c..310d370de38 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -472,7 +472,7 @@ static int subframe_updateObject(Scene *scene, Object *ob, int flags, float fram DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)modifiers_findByType(ob, eModifierType_DynamicPaint); bConstraint *con; - /* if other is dynamic paint canvas, dont update */ + /* if other is dynamic paint canvas, don't update */ if (pmd && pmd->canvas) return 1; @@ -1506,7 +1506,7 @@ int dynamicPaint_resetSurface(DynamicPaintSurface *surface) /* free existing data */ if (surface->data) dynamicPaint_freeSurfaceData(surface); - /* dont reallocate for image sequence types. they get handled only on bake */ + /* don't reallocate for image sequence types. they get handled only on bake */ if (surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ) return 1; if (numOfPoints < 1) return 0; @@ -2331,7 +2331,7 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface) int index = tx+w*ty; PaintUVPoint *tPoint = (&tempPoints[index]); - /* If point isnt't on canvas mesh */ + /* If point isn't't on canvas mesh */ if (tPoint->face_index == -1) { int u_min, u_max, v_min, v_max; int u,v, ind; @@ -2635,7 +2635,7 @@ void dynamicPaint_outputSurfaceImage(DynamicPaintSurface *surface, char* filenam } } - /* Set output format, png in case exr isnt supported */ + /* Set output format, png in case exr isn't supported */ ibuf->ftype= PNG|95; #ifdef WITH_OPENEXR if (format == R_IMF_IMTYPE_OPENEXR) { /* OpenEXR 32-bit float */ @@ -4931,7 +4931,7 @@ int dynamicPaint_calculateFrame(DynamicPaintSurface *surface, Scene *scene, Obje /* update bake data */ dynamicPaint_generateBakeData(surface, scene, cObject); - /* dont do substeps for first frame */ + /* don't do substeps for first frame */ if (surface->substeps && (frame != surface->start_frame)) { int st; timescale = 1.0f / (surface->substeps+1); diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 117414060df..f3abc20fab7 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -787,7 +787,7 @@ static void do_texture_effector(EffectorCache *eff, EffectorData *efd, EffectedP tex_co[2] += nabla; multitex_ext(eff->pd->tex, tex_co, NULL, NULL, 0, result+3); - if(mode == PFIELD_TEX_GRAD || !hasrgb) { /* if we dont have rgb fall back to grad */ + if(mode == PFIELD_TEX_GRAD || !hasrgb) { /* if we don't have rgb fall back to grad */ force[0] = (result[0].tin - result[1].tin) * strength; force[1] = (result[0].tin - result[2].tin) * strength; force[2] = (result[0].tin - result[3].tin) * strength; diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index 59f62c43b73..65bf9f0219e 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -841,7 +841,7 @@ void testhandles_fcurve (FCurve *fcu, const short use_handle) for (a=0, bezt=fcu->bezt; a < fcu->totvert; a++, bezt++) { short flag= 0; - /* flag is initialised as selection status + /* flag is initialized as selection status * of beztriple control-points (labelled 0,1,2) */ if (bezt->f2 & SELECT) flag |= (1<<1); // == 2 @@ -1446,7 +1446,7 @@ void driver_change_variable_type (DriverVar *dvar, int type) /* store the flags */ dtar->flag = flags; - /* object ID types only, or idtype not yet initialised*/ + /* object ID types only, or idtype not yet initialized*/ if ((flags & DTAR_FLAG_ID_OB_ONLY) || (dtar->idtype == 0)) dtar->idtype= ID_OB; } diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index ae474f9d9c3..e6538e1500a 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -515,7 +515,7 @@ static FModifierTypeInfo FMI_ENVELOPE = { * NOTE: this needs to be at the start of the stack to be of use, as it needs to know the extents of the * keyframes/sample-data. * - * Possible TODO - store length of cycle information that can be initialised from the extents of the + * Possible TODO - store length of cycle information that can be initialized from the extents of the * keyframes/sample-data, and adjusted as appropriate. */ diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c index ce840b63d5f..2b8db5d5940 100644 --- a/source/blender/blenkernel/intern/group.c +++ b/source/blender/blenkernel/intern/group.c @@ -344,9 +344,9 @@ void group_handle_recalc_and_update(Scene *scene, Object *UNUSED(parent), Group { GroupObject *go; -#if 0 /* warning, isnt clearing the recalc flag on the object which causes it to run all the time, +#if 0 /* warning, isn't clearing the recalc flag on the object which causes it to run all the time, * not just on frame change. - * This isnt working because the animation data is only re-evalyated on frame change so commenting for now + * This isn't working because the animation data is only re-evalyated on frame change so commenting for now * but when its enabled at some point it will need to be changed so as not to update so much - campbell */ /* if animated group... */ diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c index 72038955c55..f06ac5b7c10 100644 --- a/source/blender/blenkernel/intern/icons.c +++ b/source/blender/blenkernel/intern/icons.c @@ -91,7 +91,7 @@ static int get_next_free_id(void) while (BLI_ghash_lookup(gIcons, SET_INT_IN_POINTER(startId)) && startId>=gFirstIconId) startId++; - /* if we found a suitable one that isnt used yet, return it */ + /* if we found a suitable one that isn't used yet, return it */ if (startId>=gFirstIconId) return startId; diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index b06cc8414a6..ee79c2fed35 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -74,7 +74,7 @@ IDProperty *IDP_NewIDPArray(const char *name) IDProperty *IDP_CopyIDPArray(IDProperty *array) { - /* dont use MEM_dupallocN because this may be part of an array */ + /* don't use MEM_dupallocN because this may be part of an array */ IDProperty *narray = MEM_mallocN(sizeof(IDProperty), "IDP_CopyIDPArray"), *tmp; int i; @@ -608,9 +608,9 @@ IDProperty *IDP_GetProperties(ID *id, int create_if_needed) if (create_if_needed) { id->properties = MEM_callocN(sizeof(IDProperty), "IDProperty"); id->properties->type = IDP_GROUP; - /* dont overwrite the data's name and type + /* don't overwrite the data's name and type * some functions might need this if they - * dont have a real ID, should be named elsewhere - Campbell */ + * don't have a real ID, should be named elsewhere - Campbell */ /* strcpy(id->name, "top_level_group");*/ } return id->properties; @@ -671,7 +671,7 @@ int IDP_EqualsProperties(IDProperty *prop1, IDProperty *prop2) return 1; } -/* 'val' is never NULL, dont check */ +/* 'val' is never NULL, don't check */ IDProperty *IDP_New(const int type, const IDPropertyTemplate *val, const char *name) { IDProperty *prop=NULL; diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 3ac95b83e74..4300995b68c 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -601,7 +601,7 @@ Image *BKE_add_image_size(unsigned int width, unsigned int height, const char *n if (ima) { ImBuf *ibuf; - /* BLI_strncpy(ima->name, name, FILE_MAX); */ /* dont do this, this writes in ain invalid filepath! */ + /* BLI_strncpy(ima->name, name, FILE_MAX); */ /* don't do this, this writes in ain invalid filepath! */ ima->gen_x= width; ima->gen_y= height; ima->gen_type= uvtestgrid; @@ -1832,7 +1832,7 @@ void BKE_image_signal(Image *ima, ImageUser *iuser, int signal) break; } - /* dont use notifiers because they are not 100% sure to succeeded + /* don't use notifiers because they are not 100% sure to succeeded * this also makes sure all scenes are accounted for. */ { Scene *scene; diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 84939925b00..57a2dc41f74 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -1119,7 +1119,7 @@ static void fcurve_add_to_list (ListBase *groups, ListBase *list, FCurve *fcu, c } /* add F-Curve to group */ - /* WARNING: this func should only need to look at the stuff we initialised, if not, things may crash */ + /* WARNING: this func should only need to look at the stuff we initialized, if not, things may crash */ action_groups_add_channel(&tmp_act, agrp, fcu); if (agrp->flag & AGRP_MUTED) /* flush down */ diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index ee0c113d502..158319a802f 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1195,7 +1195,7 @@ static int check_for_dupid(ListBase *lb, ID *id, char *name) /* If the original name has no numeric suffix, * rather than just chopping and adding numbers, * shave off the end chars until we have a unique name. - * Check the null terminators match as well so we dont get Cube.000 -> Cube.00 */ + * Check the null terminators match as well so we don't get Cube.000 -> Cube.00 */ if (nr==0 && name[left_len]== '\0') { int len = left_len-1; idtest= is_dupid(lb, id, name); @@ -1211,7 +1211,7 @@ static int check_for_dupid(ListBase *lb, ID *id, char *name) if(nr > 999 && left_len > (MAX_ID_NAME - 8)) { /* this would overflow name buffer */ left[MAX_ID_NAME - 8] = 0; - /* left_len = MAX_ID_NAME - 8; */ /* for now this isnt used again */ + /* left_len = MAX_ID_NAME - 8; */ /* for now this isn't used again */ memcpy(name, left, sizeof(char) * (MAX_ID_NAME - 7)); continue; } @@ -1257,7 +1257,7 @@ int new_id(ListBase *lb, ID *id, const char *tname) } else { /* disallow non utf8 chars, - * the interface checks for this but new ID's based on file names dont */ + * the interface checks for this but new ID's based on file names don't */ BLI_utf8_invalid_strip(name, strlen(name)); } @@ -1402,7 +1402,7 @@ void BKE_library_make_local(Main *bmain, Library *lib, int untagged_only) idn= id->next; /* id is possibly being inserted again */ /* The check on the second line (LIB_PRE_EXISTING) is done so its - * possible to tag data you dont want to be made local, used for + * possible to tag data you don't want to be made local, used for * appending data, so any libdata already linked wont become local * (very nasty to discover all your links are lost after appending) * */ diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 898f881857a..6f47ed427d3 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -533,7 +533,7 @@ static void data_delete_material_index_id(ID *id, short index) curve_delete_material_index((Curve *)id, index); break; case ID_MB: - /* meta-elems dont have materials atm */ + /* meta-elems don't have materials atm */ break; } } diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index d285f909f85..3fc22b92c22 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -332,7 +332,7 @@ static void mesh_ensure_tessellation_customdata(Mesh *me) * mloopcol and mcol) have the same relative active/render/clone/mask indices. * * note that for undo mesh data we want to skip 'ensure_tess_cd' call since - * we dont want to store memory for tessface when its only used for older + * we don't want to store memory for tessface when its only used for older * versions of the mesh. - campbell*/ static void mesh_update_linked_customdata(Mesh *me, const short do_ensure_tess_cd) { @@ -2056,7 +2056,7 @@ void convert_mfaces_to_mpolys(Mesh *mesh) bm_corners_to_loops(mesh, i, mp->loopstart, numTex, numCol); } - /* note, we dont convert FGons at all, these are not even real ngons, + /* note, we don't convert FGons at all, these are not even real ngons, * they have their own UV's, colors etc - its more an editing feature. */ mesh_update_customdata_pointers(mesh, TRUE); @@ -2505,12 +2505,12 @@ int mesh_recalcTessellation(CustomData *fdata, CustomData_add_layer(fdata, CD_MFACE, CD_ASSIGN, mface, totface); /* CD_POLYINDEX will contain an array of indices from tessfaces to the polygons - * they are directly tesselated from */ + * they are directly tessellated from */ CustomData_add_layer(fdata, CD_POLYINDEX, CD_ASSIGN, mface_to_poly_map, totface); if (mface_orig_index) { - /* If polys had a CD_ORIGINDEX layer, then the tesselated faces will get this + /* If polys had a CD_ORIGINDEX layer, then the tessellated faces will get this * layer as well, pointing to polys from the original mesh (not the polys - * that just got tesselated) */ + * that just got tessellated) */ CustomData_add_layer(fdata, CD_ORIGINDEX, CD_ASSIGN, mface_orig_index, totface); } @@ -3106,7 +3106,7 @@ void BKE_mesh_tessface_calc(Mesh *mesh) mesh->totface = mesh_recalcTessellation(&mesh->fdata, &mesh->ldata, &mesh->pdata, mesh->mvert, mesh->totface, mesh->totloop, mesh->totpoly, - /* calc normals right after, dont copy from polys here */ + /* calc normals right after, don't copy from polys here */ FALSE); mesh_update_customdata_pointers(mesh, TRUE); diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 2421971c53e..138379b1bb9 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -590,7 +590,7 @@ int modifiers_indexInObject(Object *ob, ModifierData *md_seek) ModifierData *md; for (md=ob->modifiers.first; (md && md_seek!=md); md=md->next, i++); - if (!md) return -1; /* modifier isnt in the object */ + if (!md) return -1; /* modifier isn't in the object */ return i; } @@ -634,7 +634,7 @@ void test_object_modifiers(Object *ob) * * - if the ID is from a library, return library path * - else if the file has been saved return the blend file path. - * - else if the file isn't saved and the ID isnt from a library, return the temp dir. + * - else if the file isn't saved and the ID isn't from a library, return the temp dir. */ const char *modifier_path_relbase(Object *ob) { diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index f3320a0b31d..721874c83c2 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -660,7 +660,7 @@ bNodeTree *ntreeAddTree(const char *name, int type, int nodetype) /* Warning: this function gets called during some rather unexpected times * - this gets called when executing compositing updates (for threaded previews) * - when the nodetree datablock needs to be copied (i.e. when users get copied) - * - for scene duplication use ntreeSwapID() after so we dont have stale pointers. + * - for scene duplication use ntreeSwapID() after so we don't have stale pointers. */ bNodeTree *ntreeCopyTree(bNodeTree *ntree) { @@ -1146,7 +1146,7 @@ bNodeTree *ntreeLocalize(bNodeTree *ntree) bAction *action_backup= NULL, *tmpact_backup= NULL; /* Workaround for copying an action on each render! - * set action to NULL so animdata actions dont get copied */ + * set action to NULL so animdata actions don't get copied */ AnimData *adt= BKE_animdata_from_id(&ntree->id); if(adt) { diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 0557fcf5fcd..3d6a8d8f5ae 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1393,7 +1393,7 @@ void object_make_proxy(Object *ob, Object *target, Object *gob) ob->mat = MEM_dupallocN(target->mat); ob->matbits = MEM_dupallocN(target->matbits); for (i=0; i<target->totcol; i++) { - /* dont need to run test_object_materials since we know this object is new and not used elsewhere */ + /* don't need to run test_object_materials since we know this object is new and not used elsewhere */ id_us_plus((ID *)ob->mat[i]); } } diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c index 87929d6a185..3962e6d47fa 100644 --- a/source/blender/blenkernel/intern/ocean.c +++ b/source/blender/blenkernel/intern/ocean.c @@ -963,7 +963,7 @@ void BKE_free_ocean_data(struct Ocean *oc) if (oc->_fft_in) MEM_freeN(oc->_fft_in); - /* check that ocean data has been initialised */ + /* check that ocean data has been initialized */ if (oc->_htilda) { MEM_freeN(oc->_htilda); MEM_freeN(oc->_k); diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 590c307f549..21dfe437ba0 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -1629,7 +1629,7 @@ int psys_particle_dm_face_lookup(Object *ob, DerivedMesh *dm, int index, const f totface = dm->getNumTessFaces(dm); if(osface==NULL || origindex==NULL) { - /* Assume we dont need osface data */ + /* Assume we don't need osface data */ if (index <totface) { //printf("\tNO CD_ORIGSPACE, assuming not needed\n"); return index; @@ -4069,7 +4069,7 @@ void psys_get_particle_on_path(ParticleSimulationData *sim, int p, ParticleKey * pind.cache = cached ? psys->pointcache : NULL; pind.epoint = NULL; pind.bspline = (psys->part->flag & PART_HAIR_BSPLINE); - /* pind.dm disabled in editmode means we dont get effectors taken into + /* pind.dm disabled in editmode means we don't get effectors taken into * account when subdividing for instance */ pind.dm = psys_in_edit_mode(sim->scene, psys) ? NULL : psys->hair_out_dm; init_particle_interpolation(sim->ob, psys, pa, &pind); diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index bbe32c651a2..8b34bafc417 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -1096,7 +1096,7 @@ static int distribute_threads_init_data(ParticleThread *threads, Scene *scene, D dm= CDDM_from_mesh((Mesh*)ob->data, ob); - /* BMESH ONLY, for verts we dont care about tessfaces */ + /* BMESH ONLY, for verts we don't care about tessfaces */ if (from != PART_FROM_VERT) { DM_ensure_tessface(dm); } @@ -1515,7 +1515,7 @@ void initialize_particle(ParticleSimulationData *sim, ParticleData *pa, int p) pa->hair_index = 0; /* we can't reset to -1 anymore since we've figured out correct index in distribute_particles */ /* usage other than straight after distribute has to handle this index by itself - jahka*/ - //pa->num_dmcache = DMCACHE_NOTFOUND; /* assume we dont have a derived mesh face */ + //pa->num_dmcache = DMCACHE_NOTFOUND; /* assume we don't have a derived mesh face */ } static void initialize_all_particles(ParticleSimulationData *sim) { diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index fab3f096d3e..b3c242178f1 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -1050,7 +1050,7 @@ static int ptcache_path(PTCacheID *pid, char *filename) return BLI_add_slash(filename); /* new strlen() */ } else if (G.relbase_valid || lib) { - char file[MAX_PTCACHE_PATH]; /* we dont want the dir, only the file */ + char file[MAX_PTCACHE_PATH]; /* we don't want the dir, only the file */ BLI_split_file_part(blendfilename, file, sizeof(file)); i = strlen(file); @@ -2546,7 +2546,7 @@ void BKE_ptcache_remove(void) BLI_join_dirfile(path_full, sizeof(path_full), path, de->d_name); BLI_delete(path_full, 0, 0); } else { - rmdir = 0; /* unknown file, dont remove the dir */ + rmdir = 0; /* unknown file, don't remove the dir */ } } diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 054520a25f4..5c59f4c741c 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1064,7 +1064,7 @@ void scene_update_for_newframe(Main *bmain, Scene *sce, unsigned int lay) DAG_ids_flush_tagged(bmain); /* Following 2 functions are recursive - * so dont call within 'scene_update_tagged_recursive' */ + * so don't call within 'scene_update_tagged_recursive' */ DAG_scene_update_flags(bmain, sce, lay, TRUE); // only stuff that moves or needs display still /* All 'standard' (i.e. without any dependencies) animation is handled here, diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index a42261d13c7..b23b5fcb22f 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -658,14 +658,14 @@ void reload_sequence_new_file(Scene *scene, Sequence * seq, int lock_range) { char str[FILE_MAX]; int prev_startdisp=0, prev_enddisp=0; - /* note: dont rename the strip, will break animation curves */ + /* note: don't rename the strip, will break animation curves */ if (ELEM5(seq->type, SEQ_MOVIE, SEQ_IMAGE, SEQ_SOUND, SEQ_SCENE, SEQ_META)==0) { return; } if(lock_range) { - /* keep so we dont have to move the actual start and end points (only the data) */ + /* keep so we don't have to move the actual start and end points (only the data) */ calc_sequence_disp(scene, seq); prev_startdisp= seq->startdisp; prev_enddisp= seq->enddisp; @@ -1998,7 +1998,7 @@ static ImBuf * seq_render_scene_strip_impl( int have_seq= FALSE; Scene *scene; - /* dont refer to seq->scene above this point!, it can be NULL */ + /* don't refer to seq->scene above this point!, it can be NULL */ if(seq->scene == NULL) { return NULL; } @@ -3008,7 +3008,7 @@ int seqbase_isolated_sel_check(ListBase *seqbase) return TRUE; } -/* use to impose limits when dragging/extending - so impossible situations dont happen +/* use to impose limits when dragging/extending - so impossible situations don't happen * Cant use the SEQ_LEFTSEL and SEQ_LEFTSEL directly because the strip may be in a metastrip */ void seq_tx_handle_xlimits(Sequence *seq, int leftflag, int rightflag) { @@ -3163,7 +3163,7 @@ int shuffle_seq(ListBase * seqbasep, Sequence *test, Scene *evil_scene) break; } test->machine++; - calc_sequence(evil_scene, test); // XXX - I dont think this is needed since were only moving vertically, Campbell. + calc_sequence(evil_scene, test); // XXX - I don't think this is needed since were only moving vertically, Campbell. } @@ -3413,7 +3413,7 @@ int seq_swap(Sequence *seq_a, Sequence *seq_b, const char **error_str) SWAP(Sequence, *seq_a, *seq_b); - /* swap back names so animation fcurves dont get swapped */ + /* swap back names so animation fcurves don't get swapped */ BLI_strncpy(name, seq_a->name+2, sizeof(name)); BLI_strncpy(seq_a->name+2, seq_b->name+2, sizeof(seq_b->name)-2); BLI_strncpy(seq_b->name+2, name, sizeof(seq_b->name)-2); diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index dab945c44f3..664a1d0d7f9 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -360,7 +360,7 @@ static void shrinkwrap_calc_normal_projection(ShrinkwrapCalcData *calc) hit.index = -1; - hit.dist = 10000.0f; //TODO: we should use FLT_MAX here, but sweepsphere code isnt prepared for that + hit.dist = 10000.0f; //TODO: we should use FLT_MAX here, but sweepsphere code isn't prepared for that //Project over positive direction of axis if(use_normal & MOD_SHRINKWRAP_PROJECT_ALLOW_POS_DIR) diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index bffd4703ce4..5b991b7fad8 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -817,7 +817,7 @@ void smokeModifier_copy(struct SmokeModifierData *smd, struct SmokeModifierData tsmd->flow->vel_multi = smd->flow->vel_multi; } else if (tsmd->coll) { ; - /* leave it as initialised, collision settings is mostly caches */ + /* leave it as initialized, collision settings is mostly caches */ } } diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 33da4443b6f..25cfd0da1f3 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -1055,7 +1055,7 @@ static int sb_detect_aabb_collisionCached( float UNUSED(force[3]), unsigned int (aabbmin[0] > ccdm->bbmax[0]) || (aabbmin[1] > ccdm->bbmax[1]) || (aabbmin[2] > ccdm->bbmax[2]) ) { - /* boxes dont intersect */ + /* boxes don't intersect */ BLI_ghashIterator_step(ihash); continue; } @@ -1126,7 +1126,7 @@ static int sb_detect_face_pointCached(float face_v1[3],float face_v2[3],float fa (aabbmin[0] > ccdm->bbmax[0]) || (aabbmin[1] > ccdm->bbmax[1]) || (aabbmin[2] > ccdm->bbmax[2]) ) { - /* boxes dont intersect */ + /* boxes don't intersect */ BLI_ghashIterator_step(ihash); continue; } @@ -1221,7 +1221,7 @@ static int sb_detect_face_collisionCached(float face_v1[3],float face_v2[3],floa (aabbmin[0] > ccdm->bbmax[0]) || (aabbmin[1] > ccdm->bbmax[1]) || (aabbmin[2] > ccdm->bbmax[2]) ) { - /* boxes dont intersect */ + /* boxes don't intersect */ BLI_ghashIterator_step(ihash); continue; } @@ -1449,7 +1449,7 @@ static int sb_detect_edge_collisionCached(float edge_v1[3],float edge_v2[3],floa (aabbmin[0] > ccdm->bbmax[0]) || (aabbmin[1] > ccdm->bbmax[1]) || (aabbmin[2] > ccdm->bbmax[2]) ) { - /* boxes dont intersect */ + /* boxes don't intersect */ BLI_ghashIterator_step(ihash); continue; } @@ -2217,7 +2217,7 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene, Object *ob, flo compare = (obp->colball + bp->colball); sub_v3_v3v3(def, bp->pos, obp->pos); /* rather check the AABBoxes before ever calulating the real distance */ - /* mathematically it is completly nuts, but performace is pretty much (3) times faster */ + /* mathematically it is completly nuts, but performance is pretty much (3) times faster */ if ((ABS(def[0]) > compare) || (ABS(def[1]) > compare) || (ABS(def[2]) > compare)) continue; distance = normalize_v3(def); if (distance < compare ) { @@ -2588,7 +2588,7 @@ static void softbody_calc_forces(Scene *scene, Object *ob, float forcetime, floa sub_v3_v3v3(def, bp->pos, obp->pos); /* rather check the AABBoxes before ever calulating the real distance */ - /* mathematically it is completly nuts, but performace is pretty much (3) times faster */ + /* mathematically it is completly nuts, but performance is pretty much (3) times faster */ if ((ABS(def[0]) > compare) || (ABS(def[1]) > compare) || (ABS(def[2]) > compare)) continue; distance = normalize_v3(def); diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index a41e765695e..67e392fa296 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -351,7 +351,7 @@ void sound_load(struct Main *bmain, struct bSound* sound) /* load sound */ PackedFile* pf = sound->packedfile; - /* dont modify soundact->sound->name, only change a copy */ + /* don't modify soundact->sound->name, only change a copy */ BLI_strncpy(fullpath, sound->name, sizeof(fullpath)); BLI_path_abs(fullpath, ID_BLEND_PATH(bmain, &sound->id)); diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index a0d603f93ff..b968afa4d22 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -1038,7 +1038,7 @@ static void ccgDM_copyFinalVertArray(DerivedMesh *dm, MVert *mvert) vd= ccgSubSurf_getEdgeData(ss, e, x); copy_v3_v3(mvert[i].co, vd->co); /* This gives errors with -debug-fpe - * the normals dont seem to be unit length. + * the normals don't seem to be unit length. * this is most likely caused by edges with no * faces which are now zerod out, see comment in: * ccgSubSurf__calcVertNormals(), - campbell */ @@ -3064,7 +3064,7 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss, #if 0 /* this is not in trunk, can gives problems because colors initialize - * as black, just dont do it!, it works fine - campbell */ + * as black, just don't do it!, it works fine - campbell */ if (!CustomData_has_layer(&ccgdm->dm.faceData, CD_MCOL)) DM_add_tessface_layer(&ccgdm->dm, CD_MCOL, CD_CALLOC, NULL); mcol = DM_get_tessface_data_layer(&ccgdm->dm, CD_MCOL); @@ -3190,7 +3190,7 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss, /*copy over poly data, e.g. mtexpoly*/ CustomData_copy_data(&dm->polyData, &ccgdm->dm.polyData, origIndex, faceNum, 1); - /*generate tesselated face data used for drawing*/ + /*generate tessellated face data used for drawing*/ ccg_loops_to_corners(&ccgdm->dm.faceData, &ccgdm->dm.loopData, &ccgdm->dm.polyData, loopindex2-4, faceNum, faceNum, numTex, numCol, hasWCol, hasOrigSpace); diff --git a/source/blender/blenlib/BLI_bpath.h b/source/blender/blenlib/BLI_bpath.h index a0f253d9ad4..91252d3beb5 100644 --- a/source/blender/blenlib/BLI_bpath.h +++ b/source/blender/blenlib/BLI_bpath.h @@ -28,7 +28,7 @@ /** \file BLI_bpath.h * \ingroup bli * \attention Based on ghash, difference is ghash is not a fixed size, - * so for BPath we dont need to malloc + * so for BPath we don't need to malloc */ #ifndef __BLI_BPATH_H__ diff --git a/source/blender/blenlib/BLI_gsqueue.h b/source/blender/blenlib/BLI_gsqueue.h index 0265cf9b639..29c31c19047 100644 --- a/source/blender/blenlib/BLI_gsqueue.h +++ b/source/blender/blenlib/BLI_gsqueue.h @@ -58,7 +58,7 @@ int BLI_gsqueue_size(GSQueue *gq); * Access the item at the head of the queue * without removing it. * - * \param item_r A pointer to an appropriatly + * \param item_r A pointer to an appropriately * sized structure (the size passed to BLI_gsqueue_new) */ void BLI_gsqueue_peek (GSQueue *gq, void *item_r); @@ -67,7 +67,7 @@ void BLI_gsqueue_peek (GSQueue *gq, void *item_r); * Access the item at the head of the queue * and remove it. * - * \param item_r A pointer to an appropriatly + * \param item_r A pointer to an appropriately * sized structure (the size passed to BLI_gsqueue_new). * Can be NULL if desired. */ @@ -76,7 +76,7 @@ void BLI_gsqueue_pop (GSQueue *gq, void *item_r); /** * Push an element onto the tail of the queue. * - * \param item A pointer to an appropriatly + * \param item A pointer to an appropriately * sized structure (the size passed to BLI_gsqueue_new). */ void BLI_gsqueue_push (GSQueue *gq, void *item); @@ -85,7 +85,7 @@ void BLI_gsqueue_push (GSQueue *gq, void *item); * Push an element back onto the head of the queue (so * it would be returned from the next call to BLI_gsqueue_pop). * - * \param item A pointer to an appropriatly + * \param item A pointer to an appropriately * sized structure (the size passed to BLI_gsqueue_new). */ void BLI_gsqueue_pushback (GSQueue *gq, void *item); diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index d0a1311f2bc..7e5f1f2a72a 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -167,7 +167,7 @@ MINLINE float signf(float f); MINLINE float power_of_2(float f); -/* these dont really fit anywhere but were being copied about a lot */ +/* these don't really fit anywhere but were being copied about a lot */ MINLINE int is_power_of_2_i(int n); MINLINE int power_of_2_max_i(int n); MINLINE int power_of_2_min_i(int n); diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index 49da6f9cb6b..28b4794ed1b 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -138,7 +138,7 @@ int BLI_ghash_remove(GHash *gh, void *key, GHashKeyFreeFP keyfreefp, GHashValFre valfreefp(e->val); BLI_mempool_free(gh->entrypool, e); - /* correct but 'e' isnt used before return */ + /* correct but 'e' isn't used before return */ /* e= n; *//*UNUSED*/ if (p) p->next = n; diff --git a/source/blender/blenlib/intern/BLI_mempool.c b/source/blender/blenlib/intern/BLI_mempool.c index cbded248589..3d16b3af4de 100644 --- a/source/blender/blenlib/intern/BLI_mempool.c +++ b/source/blender/blenlib/intern/BLI_mempool.c @@ -45,7 +45,7 @@ #include <string.h> #include <stdlib.h> -/* note: copied from BKE_utildefines.h, dont use here because we're in BLI */ +/* note: copied from BKE_utildefines.h, don't use here because we're in BLI */ #ifdef __BIG_ENDIAN__ /* Big Endian */ # define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) ) @@ -237,7 +237,7 @@ void *BLI_mempool_calloc(BLI_mempool *pool) return retval; } -/* doesnt protect against double frees, dont be stupid! */ +/* doesnt protect against double frees, don't be stupid! */ void BLI_mempool_free(BLI_mempool *pool, void *addr) { BLI_freenode *newhead = addr; diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c index 2134cb59dc6..c4a1d4b2b8d 100644 --- a/source/blender/blenlib/intern/bpath.c +++ b/source/blender/blenlib/intern/bpath.c @@ -30,10 +30,10 @@ */ /* TODO, - * currently there are some cases we dont support. + * currently there are some cases we don't support. * - passing output paths to the visitor?, like render out. * - passing sequence strips with many images. - * - passing directory paths - visitors dont know which path is a dir or a file. + * - passing directory paths - visitors don't know which path is a dir or a file. * */ #include <sys/stat.h> @@ -191,7 +191,7 @@ void makeFilesAbsolute(Main *bmain, const char *basedir, ReportList *reports) data.count_tot, data.count_changed, data.count_failed); } -/* find this file recursively, use the biggest file so thumbnails dont get used by mistake +/* find this file recursively, use the biggest file so thumbnails don't get used by mistake * - dir: subdir to search * - filename: set this filename * - filesize: filesize for the file @@ -231,7 +231,7 @@ static int findFileRecursive(char *filename_new, BLI_join_dirfile(path, sizeof(path), dirname, de->d_name); if (stat(path, &status) != 0) - continue; /* cant stat, dont bother with this file, could print debug info here */ + continue; /* cant stat, don't bother with this file, could print debug info here */ if (S_ISREG(status.st_mode)) { /* is file */ if (strncmp(filename, de->d_name, FILE_MAX) == 0) { /* name matches */ diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 84bc397a7f8..e2850daa5b8 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -872,7 +872,7 @@ int isect_line_plane_v3(float out[3], const float l1[3], const float l2[3], cons } } -/* note: return normal isnt unit length */ +/* note: return normal isn't unit length */ void isect_plane_plane_v3(float r_isect_co[3], float r_isect_no[3], const float plane_a_co[3], const float plane_a_no[3], const float plane_b_co[3], const float plane_b_no[3]) diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index dccec7a6a42..9c80fa9ca15 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -482,7 +482,7 @@ void BLI_path_rel(char *file, const char *relfile) #endif { ++p; ++q; - /* dont search beyond the end of the string + /* don't search beyond the end of the string * in the rare case they match */ if ((*p=='\0') || (*q=='\0')) { break; @@ -560,7 +560,7 @@ static int stringframe_chars(char *path, int *char_start, int *char_end) ch_sta = ch_end = 0; for (i = 0; path[i] != '\0'; i++) { if (path[i] == '\\' || path[i] == '/') { - ch_end = 0; /* this is a directory name, dont use any hashes we found */ + ch_end = 0; /* this is a directory name, don't use any hashes we found */ } else if (path[i] == '#') { ch_sta = i; ch_end = ch_sta+1; @@ -569,7 +569,7 @@ static int stringframe_chars(char *path, int *char_start, int *char_end) } i = ch_end-1; /* keep searching */ - /* dont break, there may be a slash after this that invalidates the previous #'s */ + /* don't break, there may be a slash after this that invalidates the previous #'s */ } } @@ -681,7 +681,7 @@ int BLI_path_abs(char *path, const char *basepath) BLI_strncpy(base, basepath, sizeof(base)); - /* file component is ignored, so dont bother with the trailing slash */ + /* file component is ignored, so don't bother with the trailing slash */ BLI_cleanup_path(NULL, base); /* push slashes into unix mode - strings entering this part are @@ -694,7 +694,7 @@ int BLI_path_abs(char *path, const char *basepath) BLI_char_switch(base, '\\', '/'); /* Paths starting with // will get the blend file as their base, - * this isnt standard in any os but is used in blender all over the place */ + * this isn't standard in any os but is used in blender all over the place */ if (wasrelative) { char *lslash= BLI_last_slash(base); if (lslash) { @@ -747,7 +747,7 @@ int BLI_path_cwd(char *path) if (wasrelative==1) { char cwd[FILE_MAX]= ""; - BLI_current_working_dir(cwd, sizeof(cwd)); /* in case the full path to the blend isnt used */ + BLI_current_working_dir(cwd, sizeof(cwd)); /* in case the full path to the blend isn't used */ if (cwd[0] == '\0') { printf( "Could not get the current working directory - $PWD for an unknown reason."); @@ -756,7 +756,7 @@ int BLI_path_cwd(char *path) * * cwd should contain c:\ etc on win32 so the relbase can be NULL * relbase being NULL also prevents // being misunderstood as relative to the current - * blend file which isnt a feature we want to use in this case since were dealing + * blend file which isn't a feature we want to use in this case since were dealing * with a path from the command line, rather than from inside Blender */ char origpath[FILE_MAX]; @@ -1672,7 +1672,7 @@ char *BLI_last_slash(const char *string) else return lfslash; } -/* adds a slash if there isnt one there already */ +/* adds a slash if there isn't one there already */ int BLI_add_slash(char *string) { int len = strlen(string); diff --git a/source/blender/blenlib/intern/string_utf8.c b/source/blender/blenlib/intern/string_utf8.c index c60df413161..55ad30ab5dd 100644 --- a/source/blender/blenlib/intern/string_utf8.c +++ b/source/blender/blenlib/intern/string_utf8.c @@ -184,7 +184,7 @@ char *BLI_strncpy_utf8(char *dst, const char *src, size_t maxncpy) { char *dst_r= dst; - /* note: currently we dont attempt to deal with invalid utf8 chars */ + /* note: currently we don't attempt to deal with invalid utf8 chars */ BLI_STR_UTF8_CPY(dst, src, maxncpy) return dst_r; @@ -210,7 +210,7 @@ char *BLI_strncat_utf8(char *dst, const char *src, size_t maxncpy) size_t BLI_strncpy_wchar_as_utf8(char *dst, const wchar_t *src, const size_t maxcpy) { size_t len = 0; - while(*src && len < maxcpy) { /* XXX can still run over the buffer because utf8 size isnt known :| */ + while(*src && len < maxcpy) { /* XXX can still run over the buffer because utf8 size isn't known :| */ len += BLI_str_utf8_from_unicode(*src++, dst+len); } @@ -284,7 +284,7 @@ size_t BLI_strncpy_wchar_from_utf8(wchar_t *dst_w, const char *src_c, const size /* copied from glib's gutf8.c */ /* note, glib uses unsigned int for unicode, best we do the same, - * though we dont typedef it - campbell */ + * though we don't typedef it - campbell */ #define UTF8_COMPUTE(Char, Mask, Len) \ if (Char < 128) { \ diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h index ffac9a2a88f..bddaa5f67d6 100644 --- a/source/blender/blenloader/BLO_readfile.h +++ b/source/blender/blenloader/BLO_readfile.h @@ -235,7 +235,7 @@ struct ID *BLO_library_append_named_part(struct Main *mainl, BlendHandle** bh, c * Link/Append a named datablock from an external blend file. * optionally instance the object in the scene when the flags are set. * - * \param C The context, when NULL instancing object in the scene isnt done. + * \param C The context, when NULL instancing object in the scene isn't done. * \param mainl The main database to link from (not the active one). * \param bh The blender file handle. * \param idname The name of the datablock (without the 2 char ID prefix) diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index fcb492e02ca..6dc2dea44f0 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -1509,7 +1509,7 @@ static void IDP_DirectLinkIDPArray(IDProperty *prop, int switch_endian, FileData array= (IDProperty*) prop->data.pointer; /* note!, idp-arrays didn't exist in 2.4x, so the pointer will be cleared - * theres not really anything we can do to correct this, at least dont crash */ + * theres not really anything we can do to correct this, at least don't crash */ if(array==NULL) { prop->len= 0; prop->totallen= 0; @@ -10110,7 +10110,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) Scene *sce; for(sce= main->scene.first; sce; sce=sce->id.next) { sce->r.fg_stamp[0] = sce->r.fg_stamp[1] = sce->r.fg_stamp[2] = 0.8f; - sce->r.fg_stamp[3] = 1.0f; /* dont use text alpha yet */ + sce->r.fg_stamp[3] = 1.0f; /* don't use text alpha yet */ sce->r.bg_stamp[3] = 0.25f; /* make sure the background has full alpha */ } } @@ -14679,7 +14679,7 @@ static void library_append_end(const bContext *C, Main *mainl, FileData **fd, in if(scene) { const short is_link= (flag & FILE_LINK) != 0; if(idcode==ID_SCE) { - /* dont instance anything when linking in scenes, assume the scene its self instances the data */ + /* don't instance anything when linking in scenes, assume the scene its self instances the data */ } else { give_base_to_objects(mainvar, scene, curlib, idcode, is_link); diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 37e2308a0c1..8cd6712c560 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1712,7 +1712,7 @@ static void write_meshs(WriteData *wd, ListBase *idbase) #ifdef USE_BMESH_SAVE_WITHOUT_MFACE Mesh backup_mesh = {{0}}; - /* cache only - dont write */ + /* cache only - don't write */ backup_mesh.mface = mesh->mface; mesh->mface = NULL; /* -- */ @@ -1737,7 +1737,7 @@ static void write_meshs(WriteData *wd, ListBase *idbase) write_customdata(wd, &mesh->id, mesh->totpoly, &mesh->pdata, -1, 0); #ifdef USE_BMESH_SAVE_WITHOUT_MFACE - /* cache only - dont write */ + /* cache only - don't write */ mesh->mface = backup_mesh.mface; /* -- */ mesh->totface = backup_mesh.totface; @@ -2912,7 +2912,7 @@ int BLO_write_file(Main *mainvar, const char *filepath, int write_flags, ReportL /* blend may not have been saved before. Tn this case * we should not have any relative paths, but if there * is somehow, an invalid or empty G.main->name it will - * print an error, dont try make the absolute in this case. */ + * print an error, don't try make the absolute in this case. */ makeFilesAbsolute(mainvar, G.main->name, NULL); } } diff --git a/source/blender/blenpluginapi/intern/pluginapi.c b/source/blender/blenpluginapi/intern/pluginapi.c index aac20a96f08..b81facfac7e 100644 --- a/source/blender/blenpluginapi/intern/pluginapi.c +++ b/source/blender/blenpluginapi/intern/pluginapi.c @@ -220,7 +220,7 @@ LIBEXPORT void de_interlace(struct ImBuf *ib) /* stuff from plugin.h */ /* -------------------------------------------------------------------------- */ -/* These three need to be defined in the plugion itself. The plugin +/* These three need to be defined in the plugin itself. The plugin * loader looks for these functions to check whether it can use the * plugin. For sequences, something similar exists. */ /* int plugin_tex_getversion(void); */ diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h index 7f9982c07cf..56efe88c104 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.h @@ -242,7 +242,7 @@ BM_INLINE void _bm_elem_flag_merge(BMHeader *head_a, BMHeader *head_b); * valid value inline. * * - 'set_dirty!' -- intentionally sets the index to an invalid value, - * flagging 'bm->elem_index_dirty' so we dont use it. + * flagging 'bm->elem_index_dirty' so we don't use it. * * - 'set_ok' -- this is valid use since the part of the code is low level. * @@ -271,7 +271,7 @@ BM_INLINE void _bm_elem_index_set(BMHeader *ele, const int index); * this value is rather arbitrary */ #define BM_NGON_STACK_SIZE 32 -/* avoid inf loop, this value is arbtrary +/* avoid inf loop, this value is arbitrary * but should not error on valid cases */ #define BM_LOOP_RADIAL_MAX 10000 #define BM_NGON_MAX 100000 diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h index 8d79ba52953..ae1f0e04dae 100644 --- a/source/blender/bmesh/bmesh_class.h +++ b/source/blender/bmesh/bmesh_class.h @@ -55,7 +55,7 @@ struct Object; * hold several types of data * * 1: The type of the element (vert, edge, loop or face) - * 2: Persistant "header" flags/markings (smooth, seam, select, hidden, ect) + * 2: Persistent "header" flags/markings (smooth, seam, select, hidden, ect) * note that this is different from the "tool" flags. * 3: Unique ID in the bmesh. * 4: some elements for internal record keeping. @@ -117,7 +117,7 @@ typedef struct BMLoop { struct BMLoop *next, *prev; /* next/prev verts around the face */ } BMLoop; -/* can cast BMFace/BMEdge/BMVert, but NOT BMLoop, since these dont have a flag layer */ +/* can cast BMFace/BMEdge/BMVert, but NOT BMLoop, since these don't have a flag layer */ typedef struct BMElemF { BMHeader head; struct BMFlagLayer *oflags; /* keep after header, an array of flags, mostly used by the operator stack */ @@ -162,7 +162,7 @@ typedef struct BMesh { /* flag index arrays as being dirty so we can check if they are clean and * avoid looping over the entire vert/edge/face array in those cases. * valid flags are - BM_VERT | BM_EDGE | BM_FACE. - * BM_LOOP isnt handled so far. */ + * BM_LOOP isn't handled so far. */ char elem_index_dirty; /*element pools*/ @@ -181,7 +181,7 @@ typedef struct BMesh { /* should be copy of scene select mode */ /* stored in BMEditMesh too, this is a bit confusing, - * make sure the're in sync! + * make sure they're in sync! * Only use when the edit mesh cant be accessed - campbell */ short selectmode; diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 804c14747b8..a9e6827676c 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -500,7 +500,7 @@ void BMO_remove_tagged_verts(BMesh *bm, const short oflag) * api functions that take a filter callback..... * and this new filter type will be for opstack flags. * This is because the BM_remove_taggedXXX functions bypass iterator API. - * - Ops dont care about 'UI' considerations like selection state, hide state, ect. + * - Ops don't care about 'UI' considerations like selection state, hide state, ect. * If you want to work on unhidden selections for instance, * copy output from a 'select context' operator to another operator.... */ diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 133e446f891..af87de2ec6f 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -1161,7 +1161,7 @@ BMFace *bmesh_sfme(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2, #endif /* validate both loop */ - /* I dont know how many loops are supposed to be in each face at this point! FIXME */ + /* I don't know how many loops are supposed to be in each face at this point! FIXME */ /* go through all of f2's loops and make sure they point to it properly */ l_iter = l_first = BM_FACE_FIRST_LOOP(f2); diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c index 5b8b537c669..2a3242d87c1 100644 --- a/source/blender/bmesh/intern/bmesh_interp.c +++ b/source/blender/bmesh/intern/bmesh_interp.c @@ -633,7 +633,7 @@ void BM_loop_interp_from_face(BMesh *bm, BMLoop *target, BMFace *source, axis_dominant_v3(&ax, &ay, source->no); - /* scale source face coordinates a bit, so points sitting directonly on an + /* scale source face coordinates a bit, so points sitting directly on an * edge will work. */ mul_v3_fl(cent, 1.0f / (float)source->len); for (i = 0; i < source->len; i++) { @@ -696,7 +696,7 @@ void BM_vert_interp_from_face(BMesh *bm, BMVert *v, BMFace *source) i++; } while ((l_iter = l_iter->next) != l_first); - /* scale source face coordinates a bit, so points sitting directonly on an + /* scale source face coordinates a bit, so points sitting directly on an * edge will work. */ mul_v3_fl(cent, 1.0f / (float)source->len); for (i = 0; i < source->len; i++) { diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c index 89bce16f2ca..a8840cf8938 100644 --- a/source/blender/bmesh/intern/bmesh_marking.c +++ b/source/blender/bmesh/intern/bmesh_marking.c @@ -606,7 +606,7 @@ void BM_editselection_plane(BMesh *bm, float r_plane[3], BMEditSelection *ese) /* make a fake plane thats at rightangles to the normal * we cant make a crossvec from a vec thats the same as the vec * unlikely but possible, so make sure if the normal is (0, 0, 1) - * that vec isnt the same or in the same direction even. */ + * that vec isn't the same or in the same direction even. */ if (eve->no[0] < 0.5f) vec[0] = 1.0f; else if (eve->no[1] < 0.5f) vec[1] = 1.0f; else vec[2] = 1.0f; @@ -638,7 +638,7 @@ void BM_editselection_plane(BMesh *bm, float r_plane[3], BMEditSelection *ese) /* make a fake plane thats at rightangles to the normal * we cant make a crossvec from a vec thats the same as the vec * unlikely but possible, so make sure if the normal is (0, 0, 1) - * that vec isnt the same or in the same direction even. */ + * that vec isn't the same or in the same direction even. */ if (efa->len < 3) { /* crappy fallback method */ if (efa->no[0] < 0.5f) vec[0] = 1.0f; diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index 096c1fabc5e..f69a46e7d8c 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -58,7 +58,7 @@ static void bm_mempool_init(BMesh *bm, const BMAllocTemplate *allocsize) bm->looplistpool = BLI_mempool_create(sizeof(BMLoopList), allocsize[3], allocsize[3], FALSE, FALSE); #endif - /* allocate one flag pool that we dont get rid of. */ + /* allocate one flag pool that we don't get rid of. */ bm->toolflagpool = BLI_mempool_create(sizeof(BMFlagLayer), 512, 512, 0); } @@ -79,7 +79,7 @@ BMesh *BM_mesh_create(BMAllocTemplate *allocsize) /* allocate the memory pools for the mesh elements */ bm_mempool_init(bm, allocsize); - /* allocate one flag pool that we dont get rid of. */ + /* allocate one flag pool that we don't get rid of. */ bm->stackdepth = 1; bm->totflags = 1; diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index 24cb2bc4d5a..b10e25a318c 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -251,7 +251,7 @@ void BM_mesh_bm_from_me(BMesh *bm, Mesh *me, int set_key, int act_key_nr) continue; } - /* dont use 'i' since we may have skipped the face */ + /* don't use 'i' since we may have skipped the face */ BM_elem_index_set(f, bm->totface - 1); /* set_ok */ /* transfer flag */ diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 5248276bae6..2b9387ed73d 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -91,7 +91,7 @@ int BM_vert_dissolve(BMesh *bm, BMVert *v) } } else if (len == 2 && BM_vert_face_count(v) == 1) { - /* boundry vertex on a face */ + /* boundary vertex on a face */ return (BM_vert_collapse_edge(bm, v->e, v, TRUE) != NULL); } else { @@ -540,7 +540,7 @@ BMEdge *BM_vert_collapse_faces(BMesh *bm, BMEdge *ke, BMVert *kv, float fac, else { /* single face or no faces */ /* same as BM_vert_collapse_edge() however we already - * have vars to perform this operation so dont call. */ + * have vars to perform this operation so don't call. */ ne = bmesh_jekv(bm, ke, kv, TRUE); /* ne = BM_edge_exists(tv, tv2); */ /* same as return above */ @@ -801,7 +801,7 @@ int BM_face_validate(BMesh *bm, BMFace *face, FILE *err) * * Examples: * - the newly formed edge already exists - * - the new face would be degenerate (zero area / concav / bow-tie) + * - the new face would be degenerate (zero area / concave / bow-tie) * - may want to measure if the new edge gives improved results topology. * over the old one, as with beauty fill. * @@ -824,8 +824,8 @@ void BM_edge_rotate_calc(BMesh *bm, BMEdge *e, int ccw, BM_edge_ordered_verts(e, &v1, &v2); /* we could swap the verts _or_ the faces, swapping faces - * gives more predictable resuts since that way the next vert - * just sitches from face fa / fb */ + * gives more predictable results since that way the next vert + * just stitches from face fa / fb */ if (ccw) { SWAP(BMFace *, fa, fb); } @@ -833,7 +833,7 @@ void BM_edge_rotate_calc(BMesh *bm, BMEdge *e, int ccw, *r_l1 = BM_face_other_vert_loop(fb, v2, v1); *r_l2 = BM_face_other_vert_loop(fa, v1, v2); - /* when assert isnt used */ + /* when assert isn't used */ (void)bm; } @@ -852,7 +852,7 @@ int BM_edge_rotate_check(BMesh *UNUSED(bm), BMEdge *e) la = BM_face_other_vert_loop(fa, e->v2, e->v1); lb = BM_face_other_vert_loop(fb, e->v2, e->v1); - /* check that the next vert in both faces isnt the same + /* check that the next vert in both faces isn't the same * (ie - the next edge doesnt share the same faces). * since we can't rotate usefully in this case. */ if (la->v == lb->v) { @@ -879,7 +879,7 @@ int BM_edge_rotate_check(BMesh *UNUSED(bm), BMEdge *e) * * Check 2 cases * 1) does the newly forms edge form a flipped face (compare with previous cross product) - * 2) does the newly formed edge caise a zero area corner (or close enough to be almost zero) + * 2) does the newly formed edge cause a zero area corner (or close enough to be almost zero) * * \param l1,l2 are the loops of the proposed verts to rotate too and should * be the result of calling #BM_edge_rotate_calc @@ -972,7 +972,7 @@ int BM_edge_rotate_check_degenerate(BMesh *bm, BMEdge *e, return TRUE; - /* when assert isnt used */ + /* when assert isn't used */ (void)bm; } @@ -1070,9 +1070,9 @@ BMEdge *BM_edge_rotate(BMesh *bm, BMEdge *e, const short ccw, const short check_ return NULL; } else { - /* we should reallty be able to know the faces some other way, + /* we should really be able to know the faces some other way, * rather then fetching them back from the edge, but this is predictable - * where using the return values from face split isnt. - campbell */ + * where using the return values from face split isn't. - campbell */ BMFace *fa, *fb; if (BM_edge_face_pair(e_new, &fa, &fb)) { fa->head.hflag = f_hflag_prev_1; diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index f2dcaded8ca..1555974eac7 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -93,7 +93,7 @@ /* * Vertex Smooth * - * Smoothes vertices by using a basic vertex averaging scheme. + * Smooths vertices by using a basic vertex averaging scheme. */ static BMOpDefine bmo_vertexsmooth_def = { "vertexsmooth", @@ -740,7 +740,7 @@ static BMOpDefine bmo_split_def = { {BMO_OP_SLOT_MAPPING, "boundarymap"}, {BMO_OP_SLOT_MAPPING, "isovertmap"}, {BMO_OP_SLOT_PNT, "dest"}, /* destination bmesh, if NULL will use current on */ - {BMO_OP_SLOT_BOOL, "use_only_faces"}, /* when enabled. dont duplicate loose verts/edges */ + {BMO_OP_SLOT_BOOL, "use_only_faces"}, /* when enabled. don't duplicate loose verts/edges */ {0} /* null-terminating sentine */}, bmo_split_exec, 0 diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c index cc9dfe1701b..341bb877f93 100644 --- a/source/blender/bmesh/intern/bmesh_queries.c +++ b/source/blender/bmesh/intern/bmesh_queries.c @@ -482,7 +482,7 @@ int BM_edge_is_manifold(BMesh *UNUSED(bm), BMEdge *e) * of a shell (has one face associated with it) */ -#if 1 /* fast path for checking boundry */ +#if 1 /* fast path for checking boundary */ int BM_edge_is_boundary(BMEdge *e) { const BMLoop *l = e->l; @@ -595,7 +595,7 @@ BMLoop *BM_face_vert_share_loop(BMFace *f, BMVert *v) * Returns the verts of an edge as used in a face * if used in a face at all, otherwise just assign as used in the edge. * - * Useful to get a determanistic winding order when calling + * Useful to get a deterministic winding order when calling * BM_face_create_ngon() on an arbitrary array of verts, * though be sure to pick an edge which has a face. */ @@ -680,7 +680,7 @@ void BM_loop_face_tangent(BMesh *UNUSED(bm), BMLoop *l, float r_tangent[3]) cross_v3_v3v3(r_tangent, dir, nor); } else { - /* prev/next are the same - compare with face normal since we dont have one */ + /* prev/next are the same - compare with face normal since we don't have one */ cross_v3_v3v3(r_tangent, v_next, l->f->no); } @@ -861,7 +861,7 @@ int BM_face_exists_multi(BMesh *bm, BMVert **varr, BMEdge **earr, int len) } } - /* now tag all verts and edges in the boundry array as true so + /* now tag all verts and edges in the boundary array as true so * we can know if a face-vert is from our array */ for (i = 0; i < len; i++) { BM_elem_flag_enable(varr[i], BM_ELEM_INTERNAL_TAG); @@ -869,10 +869,10 @@ int BM_face_exists_multi(BMesh *bm, BMVert **varr, BMEdge **earr, int len) } - /* so! boundry is tagged, everything else cleared */ + /* so! boundary is tagged, everything else cleared */ - /* 1) tag all faces connected to edges - if all their verts are boundry */ + /* 1) tag all faces connected to edges - if all their verts are boundary */ tot_tag = 0; for (i = 0; i < len; i++) { BM_ITER(f, &fiter, bm, BM_FACES_OF_EDGE, earr[i]) { @@ -886,7 +886,7 @@ int BM_face_exists_multi(BMesh *bm, BMVert **varr, BMEdge **earr, int len) } if (ok) { - /* we only use boundry verts */ + /* we only use boundary verts */ BM_elem_flag_enable(f, BM_ELEM_INTERNAL_TAG); tot_tag++; } @@ -898,19 +898,19 @@ int BM_face_exists_multi(BMesh *bm, BMVert **varr, BMEdge **earr, int len) } if (tot_tag == 0) { - /* no faces use only boundry verts, quit early */ + /* no faces use only boundary verts, quit early */ return FALSE; } - /* 2) loop over non-boundry edges that use boundry verts, + /* 2) loop over non-boundary edges that use boundary verts, * check each have 2 tagges faces connected (faces that only use 'varr' verts) */ ok = TRUE; for (i = 0; i < len; i++) { BM_ITER(e, &fiter, bm, BM_EDGES_OF_VERT, varr[i]) { - if (/* non-boundry edge */ + if (/* non-boundary edge */ BM_elem_flag_test(e, BM_ELEM_INTERNAL_TAG) == FALSE && - /* ...using boundry verts */ + /* ...using boundary verts */ BM_elem_flag_test(e->v1, BM_ELEM_INTERNAL_TAG) == TRUE && BM_elem_flag_test(e->v2, BM_ELEM_INTERNAL_TAG) == TRUE) { diff --git a/source/blender/bmesh/intern/bmesh_walkers.h b/source/blender/bmesh/intern/bmesh_walkers.h index 9ea9e332c5f..90f7b36e3a2 100644 --- a/source/blender/bmesh/intern/bmesh_walkers.h +++ b/source/blender/bmesh/intern/bmesh_walkers.h @@ -121,7 +121,7 @@ enum { /* walk over an island of flagged faces. note, that this doesn't work on * non-manifold geometry. it might be better to rewrite this to extract * boundary info from the island walker, rather then directly walking - * over the boundary. raises an error if it encouters nonmanifold + * over the boundary. raises an error if it encounters nonmanifold * geometry. */ BMW_ISLANDBOUND, /* walk over all faces in an island of tool flagged faces. */ diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index b327bf1ef8d..3a5b7120430 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -349,7 +349,7 @@ static void *bmw_IslandWalker_step(BMWalker *walker) l = BM_iter_new(&liter, walker->bm, BM_LOOPS_OF_FACE, iwalk->cur); for ( ; l; l = BM_iter_step(&liter)) { - /* could skip loop here too, but dont add unless we need it */ + /* could skip loop here too, but don't add unless we need it */ if (walker->mask_edge && !BMO_elem_flag_test(walker->bm, l->e, walker->mask_edge)) { continue; } @@ -395,11 +395,11 @@ static void bmw_LoopWalker_begin(BMWalker *walker, void *data) lwalk->cur = lwalk->start = e; lwalk->lastv = lwalk->startv = v; - lwalk->is_boundry = BM_edge_is_boundary(e); + lwalk->is_boundary = BM_edge_is_boundary(e); lwalk->is_single = (vert_edge_count[0] == 2 && vert_edge_count[1] == 2); /* could also check that vertex*/ - if ((lwalk->is_boundry == FALSE) && + if ((lwalk->is_boundary == FALSE) && (vert_edge_count[0] == 3 || vert_edge_count[1] == 3)) { BMIter iter; @@ -472,7 +472,7 @@ static void *bmw_LoopWalker_step(BMWalker *walker) lwalk->cur = nexte; lwalk->lastv = v; - lwalk->is_boundry = owalk.is_boundry; + lwalk->is_boundary = owalk.is_boundary; lwalk->is_single = owalk.is_single; lwalk->f_hub = owalk.f_hub; @@ -492,19 +492,19 @@ static void *bmw_LoopWalker_step(BMWalker *walker) /* typical loopiong over edges in the middle of a mesh */ /* however, why use 2 here at all? I guess for internal ngon loops it can be useful. Antony R. */ - ((vert_edge_tot == 4 || vert_edge_tot == 2) && owalk.is_boundry == FALSE) || + ((vert_edge_tot == 4 || vert_edge_tot == 2) && owalk.is_boundary == FALSE) || - /* walk over boundry of faces but stop at corners */ - (owalk.is_boundry == TRUE && owalk.is_single == FALSE && vert_edge_tot > 2) || + /* walk over boundary of faces but stop at corners */ + (owalk.is_boundary == TRUE && owalk.is_single == FALSE && vert_edge_tot > 2) || - /* initial edge was a boundry, so is this edge and vertex is only apart of this face - * this lets us walk over the the boundry of an ngon which is handy */ - (owalk.is_boundry == TRUE && owalk.is_single == TRUE && vert_edge_tot == 2 && BM_edge_is_boundary(e))) + /* initial edge was a boundary, so is this edge and vertex is only apart of this face + * this lets us walk over the the boundary of an ngon which is handy */ + (owalk.is_boundary == TRUE && owalk.is_single == TRUE && vert_edge_tot == 2 && BM_edge_is_boundary(e))) { i = 0; stopi = vert_edge_tot / 2; while (1) { - if ((owalk.is_boundry == FALSE) && (i == stopi)) { + if ((owalk.is_boundary == FALSE) && (i == stopi)) { break; } @@ -530,12 +530,12 @@ static void *bmw_LoopWalker_step(BMWalker *walker) if (l != NULL) { if (l != e->l && !BLI_ghash_haskey(walker->visithash, l->e)) { - if (!(owalk.is_boundry == FALSE && i != stopi)) { + if (!(owalk.is_boundary == FALSE && i != stopi)) { lwalk = BMW_state_add(walker); lwalk->cur = l->e; lwalk->lastv = v; - lwalk->is_boundry = owalk.is_boundry; + lwalk->is_boundary = owalk.is_boundary; lwalk->is_single = owalk.is_single; lwalk->f_hub = owalk.f_hub; @@ -557,7 +557,7 @@ static void *bmw_LoopWalker_step(BMWalker *walker) lwalk->cur = nexte; lwalk->lastv = v; - lwalk->is_boundry = owalk.is_boundry; + lwalk->is_boundary = owalk.is_boundary; lwalk->is_single = owalk.is_single; lwalk->f_hub = owalk.f_hub; diff --git a/source/blender/bmesh/intern/bmesh_walkers_private.h b/source/blender/bmesh/intern/bmesh_walkers_private.h index b6c7a974fce..fc563932c3c 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_private.h +++ b/source/blender/bmesh/intern/bmesh_walkers_private.h @@ -62,7 +62,7 @@ typedef struct BMwLoopWalker { BMEdge *cur, *start; BMVert *lastv, *startv; BMFace *f_hub; - short is_boundry; /* boundry looping changes behavior */ + short is_boundary; /* boundary looping changes behavior */ short is_single; /* single means the edge verts are only connected to 1 face */ } BMwLoopWalker; diff --git a/source/blender/bmesh/operators/bmo_bevel.c b/source/blender/bmesh/operators/bmo_bevel.c index e881e1e277a..3462b4cb8fe 100644 --- a/source/blender/bmesh/operators/bmo_bevel.c +++ b/source/blender/bmesh/operators/bmo_bevel.c @@ -59,7 +59,7 @@ static void calc_corner_co(BMesh *bm, BMLoop *l, const float fac, float r_co[3], copy_v3_v3(l_co, l->v->co); copy_v3_v3(l_co_next, l->next->v->co); - /* calculate norma */ + /* calculate normal */ sub_v3_v3v3(l_vec_prev, l_co_prev, l_co); sub_v3_v3v3(l_vec_next, l_co_next, l_co); @@ -551,7 +551,7 @@ void bmo_bevel_exec(BMesh *bm, BMOperator *op) /* set edge lengths of cross edges as the average of the cross edges they're based o */ if (has_elens) { - /* angle happens not to be used. why? - not sure it just isnt - campbell. + /* angle happens not to be used. why? - not sure it just isn't - campbell. * leave this in in case we need to use it later */ #if 0 float ang; diff --git a/source/blender/bmesh/operators/bmo_create.c b/source/blender/bmesh/operators/bmo_create.c index c31302f469f..8b5ae5f2e71 100644 --- a/source/blender/bmesh/operators/bmo_create.c +++ b/source/blender/bmesh/operators/bmo_create.c @@ -1257,7 +1257,7 @@ void bmo_edgenet_prepare(BMesh *bm, BMOperator *op) } /* This is what runs when pressing the F key - * doing the best thing here isnt always easy create vs dissolve, its nice to support + * doing the best thing here isn't always easy create vs dissolve, its nice to support * but it it _really_ gives issues we might have to not call dissolve. - campbell */ void bmo_contextual_create_exec(BMesh *bm, BMOperator *op) diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index 3f17c7040b3..2fc1a0d9e51 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -517,7 +517,7 @@ void bmo_dissolve_limit_exec(BMesh *bm, BMOperator *op) e->l->radial_next->f, e); /* join faces */ - /* there may be some errors, we dont mind, just move on */ + /* there may be some errors, we don't mind, just move on */ if (nf == NULL) { BMO_error_clear(bm); } diff --git a/source/blender/bmesh/operators/bmo_edgesplit.c b/source/blender/bmesh/operators/bmo_edgesplit.c index 44d0ad4ff94..20dd6321a4f 100644 --- a/source/blender/bmesh/operators/bmo_edgesplit.c +++ b/source/blender/bmesh/operators/bmo_edgesplit.c @@ -34,7 +34,7 @@ enum { * Remove the EDGE_SEAM flag for edges we cant split * * un-tag edges not connected to other tagged edges, - * unless they are on a boundry + * unless they are on a boundary */ static void bm_edgesplit_validate_seams(BMesh *bm, BMOperator *op) { @@ -49,7 +49,7 @@ static void bm_edgesplit_validate_seams(BMesh *bm, BMOperator *op) vtouch = MEM_callocN(sizeof(char) * bm->totvert, __func__); - /* tag all boundry verts so as not to untag an edge which is inbetween only 2 faces [] */ + /* tag all boundary verts so as not to untag an edge which is inbetween only 2 faces [] */ BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) { /* unrelated to flag assignment in this function - since this is the @@ -60,7 +60,7 @@ static void bm_edgesplit_validate_seams(BMesh *bm, BMOperator *op) vt = &vtouch[BM_elem_index_get(e->v1)]; if (*vt < 2) (*vt)++; vt = &vtouch[BM_elem_index_get(e->v2)]; if (*vt < 2) (*vt)++; - /* while the boundry verts need to be tagged, + /* while the boundary verts need to be tagged, * the edge its self can't be split */ BMO_elem_flag_disable(bm, e, EDGE_SEAM); } @@ -69,7 +69,7 @@ static void bm_edgesplit_validate_seams(BMesh *bm, BMOperator *op) /* single marked edges unconnected to any other marked edges * are illegal, go through and unmark them */ BMO_ITER(e, &siter, bm, op, "edges", BM_EDGE) { - /* lame, but we dont want the count to exceed 255, + /* lame, but we don't want the count to exceed 255, * so just count to 2, its all we need */ unsigned char *vt; vt = &vtouch[BM_elem_index_get(e->v1)]; if (*vt < 2) (*vt)++; diff --git a/source/blender/bmesh/operators/bmo_extrude.c b/source/blender/bmesh/operators/bmo_extrude.c index 8e5792b6a15..4199b56d00e 100644 --- a/source/blender/bmesh/operators/bmo_extrude.c +++ b/source/blender/bmesh/operators/bmo_extrude.c @@ -440,7 +440,7 @@ static void calc_solidify_normals(BMesh *bm) } } MEM_freeN(edge_face_count); - edge_face_count = NULL; /* dont re-use */ + edge_face_count = NULL; /* don't re-use */ BM_ITER(v, &viter, bm, BM_VERTS_OF_MESH, NULL) { if (!BM_vert_is_manifold(bm, v)) { diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c index 48a25214b54..e4ddbb7d0d8 100644 --- a/source/blender/bmesh/operators/bmo_primitive.c +++ b/source/blender/bmesh/operators/bmo_primitive.c @@ -432,7 +432,7 @@ void bmo_create_icosphere_exec(BMesh *bm, BMOperator *op) BMO_op_finish(bm, &bmop); } - /* must transform after becayse of sphere subdivision */ + /* must transform after because of sphere subdivision */ BM_ITER(v, &viter, bm, BM_VERTS_OF_MESH, NULL) { if (BMO_elem_flag_test(bm, v, VERT_MARK)) { mul_m4_v3(mat, v->co); diff --git a/source/blender/bmesh/operators/bmo_utils.c b/source/blender/bmesh/operators/bmo_utils.c index 198064d26dd..78b4714deb1 100644 --- a/source/blender/bmesh/operators/bmo_utils.c +++ b/source/blender/bmesh/operators/bmo_utils.c @@ -155,7 +155,7 @@ void bmo_edgerotate_exec(BMesh *bm, BMOperator *op) BMO_elem_flag_enable(bm, e2, EDGE_OUT); - /* dont touch again */ + /* don't touch again */ BMO_elem_flag_enable(bm, fa, FACE_TAINT); BMO_elem_flag_enable(bm, fb, FACE_TAINT); } @@ -702,7 +702,7 @@ static float edge_angle(BMesh *bm, BMEdge *e) BMIter fiter; BMFace *f, *f_prev = NULL; - /* first edge faces, dont account for 3+ */ + /* first edge faces, don't account for 3+ */ BM_ITER(f, &fiter, bm, BM_FACES_OF_EDGE, e) { if (f_prev == NULL) { diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index 9ce148bc083..5d6d02bef63 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -853,7 +853,7 @@ short paste_animedit_keys (bAnimContext *ac, ListBase *anim_data, } } - /* dont continue if some fcurves were pasted */ + /* don't continue if some fcurves were pasted */ if (totmatch) break; } diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index ec02f406fcf..5945d25f3ee 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -1965,7 +1965,7 @@ float ED_rollBoneToVector(EditBone *bone, const float align_axis[3], const short sub_v3_v3v3(nor, bone->tail, bone->head); vec_roll_to_mat3(nor, 0.0f, mat); - /* check the bone isnt aligned with the axis */ + /* check the bone isn't aligned with the axis */ if(!is_zero_v3(align_axis) && angle_v3v3(align_axis, mat[2]) > FLT_EPSILON) { float vec[3], align_axis_proj[3], roll; @@ -2153,7 +2153,7 @@ static void undoBones_to_editBones(void *uarmv, void *armv, void *UNUSED(data)) for(newebo= arm->edbo->first; newebo; newebo= newebo->next) { if(newebo->parent) newebo->parent= newebo->parent->temp; } - /* be sure they dont hang ever */ + /* be sure they don't hang ever */ for(newebo= arm->edbo->first; newebo; newebo= newebo->next) { newebo->temp= NULL; } @@ -3386,7 +3386,7 @@ static int armature_extrude_exec(bContext *C, wmOperator *op) newbone->zwidth= ebone->zwidth; newbone->ease1= ebone->ease1; newbone->ease2= ebone->ease2; - newbone->rad_head= ebone->rad_tail; // dont copy entire bone... + newbone->rad_head= ebone->rad_tail; // don't copy entire bone... newbone->rad_tail= ebone->rad_tail; newbone->segments= 1; newbone->layer= ebone->layer; diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 8caa6cc6e26..b49ea7e5595 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -2256,13 +2256,13 @@ static int smooth_radius_exec(bContext *C, wmOperator *UNUSED(op)) /* if endpoints selected, then use them */ if (start_sel==0) { start_rad = (nu->bezt+start_sel)->radius; - start_sel++; /* we dont want to edit the selected endpoint */ + start_sel++; /* we don't want to edit the selected endpoint */ } else { start_rad = (nu->bezt+start_sel-1)->radius; } if (end_sel==nu->pntsu-1) { end_rad = (nu->bezt+end_sel)->radius; - end_sel--; /* we dont want to edit the selected endpoint */ + end_sel--; /* we don't want to edit the selected endpoint */ } else { end_rad = (nu->bezt+end_sel+1)->radius; } @@ -2318,13 +2318,13 @@ static int smooth_radius_exec(bContext *C, wmOperator *UNUSED(op)) /* if endpoints selected, then use them */ if (start_sel==0) { start_rad = (nu->bp+start_sel)->radius; - start_sel++; /* we dont want to edit the selected endpoint */ + start_sel++; /* we don't want to edit the selected endpoint */ } else { start_rad = (nu->bp+start_sel-1)->radius; } if (end_sel==nu->pntsu-1) { end_rad = (nu->bp+end_sel)->radius; - end_sel--; /* we dont want to edit the selected endpoint */ + end_sel--; /* we don't want to edit the selected endpoint */ } else { end_rad = (nu->bp+end_sel+1)->radius; } diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index 76af016b6c6..b307052d37a 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -79,7 +79,7 @@ typedef enum eDrawStrokeFlags { GP_DRAWDATA_ONLYV2D = (1<<2), /* only draw 'canvas' strokes */ GP_DRAWDATA_ONLYI2D = (1<<3), /* only draw 'image' strokes */ GP_DRAWDATA_IEDITHACK = (1<<4), /* special hack for drawing strokes in Image Editor (weird coordinates) */ - GP_DRAWDATA_NO_XRAY = (1<<5), /* dont draw xray in 3D view (which is default) */ + GP_DRAWDATA_NO_XRAY = (1<<5), /* don't draw xray in 3D view (which is default) */ } eDrawStrokeFlags; @@ -298,7 +298,7 @@ static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness_s for (i=0, pt1=points, pt2=points+1; i < (totpoints-1); i++, pt1++, pt2++) { float s0[2], s1[2]; /* segment 'center' points */ - float t0[2], t1[2]; /* tesselated coordinates */ + float t0[2], t1[2]; /* tessellated coordinates */ float m1[2], m2[2]; /* gradient and normal */ float mt[2], sc[2]; /* gradient for thickness, point for end-cap */ float pthick; /* thickness at segment point */ @@ -513,7 +513,7 @@ static void gp_draw_strokes (bGPDframe *gpf, int offsx, int offsy, int winx, int glDepthMask(0); glEnable(GL_DEPTH_TEST); - /* first arg is normally rv3d->dist, but this isnt available here and seems to work quite well without */ + /* first arg is normally rv3d->dist, but this isn't available here and seems to work quite well without */ bglPolygonOffset(1.0f, 1.0f); #if 0 glEnable(GL_POLYGON_OFFSET_LINE); @@ -783,7 +783,7 @@ void draw_gpencil_view3d (Scene *scene, View3D *v3d, ARegion *ar, short only3d) gpd= gpencil_data_get_active_v3d(scene); // XXX if (gpd == NULL) return; - /* when rendering to the offscreen buffer we dont want to + /* when rendering to the offscreen buffer we don't want to * deal with the camera border, otherwise map the coords to the camera border. */ if ((rv3d->persp == RV3D_CAMOB) && !(G.f & G_RENDER_OGL)) { rctf rectf; diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c index c932eb4c7d0..36f78e151d5 100644 --- a/source/blender/editors/gpencil/editaction_gpencil.c +++ b/source/blender/editors/gpencil/editaction_gpencil.c @@ -561,7 +561,7 @@ static short mirror_gpf_xaxis (bGPDframe *gpf, Scene *scene) static short mirror_gpf_marker (bGPDframe *gpf, Scene *scene) { static TimeMarker *marker; - static short initialised = 0; + static short initialized = 0; int diff; /* In order for this mirror function to work without @@ -581,16 +581,16 @@ static short mirror_gpf_marker (bGPDframe *gpf, Scene *scene) } else { /* initialization time */ - if (initialised) { + if (initialized) { /* reset everything for safety */ marker = NULL; - initialised = 0; + initialized = 0; } else { /* try to find a marker */ marker= ED_markers_get_first_selected(&scene->markers); if(marker) { - initialised= 1; + initialized= 1; } } } diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 9136274e39a..390ee76dfcc 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -706,7 +706,7 @@ int uiButActiveOnly(const bContext *C, uiBlock *block, uiBut *but) return 1; } -/* use to check if we need to disable undo, but dont make any changes +/* use to check if we need to disable undo, but don't make any changes * returns FALSE if undo needs to be disabled. */ static int ui_but_is_rna_undo(uiBut *but) { @@ -1880,7 +1880,7 @@ void ui_set_but_soft_range(uiBut *but, double value) { /* ideally we would not limit this but practically, its more then * enough worst case is very long vectors wont use a smart soft-range - * which isnt so bad. */ + * which isn't so bad. */ if(but->rnaprop) { const PropertyType type= RNA_property_type(but->rnaprop); @@ -2957,7 +2957,7 @@ void autocomplete_end(AutoComplete *autocpl, char *autoname) if(autocpl->truncate[0]) BLI_strncpy(autoname, autocpl->truncate, autocpl->maxlen); else { - if (autoname != autocpl->startname) /* dont copy a string over its self */ + if (autoname != autocpl->startname) /* don't copy a string over its self */ BLI_strncpy(autoname, autocpl->startname, autocpl->maxlen); } MEM_freeN(autocpl->truncate); diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index cfd9f65cf00..39ae2ec37f4 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -1052,7 +1052,7 @@ void ui_draw_but_COLORBAND(uiBut *but, uiWidgetColors *UNUSED(wcol), rcti *rect) float x1, y1, sizex, sizey; float v3[2], v1[2], v2[2], v1a[2], v2a[2]; int a; - float pos, colf[4]= {0,0,0,0}; /* initialize in case the colorband isnt valid */ + float pos, colf[4]= {0,0,0,0}; /* initialize in case the colorband isn't valid */ coba= (ColorBand *)(but->editcoba? but->editcoba: but->poin); if(coba==NULL) return; diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 537de167153..c7db8d9214f 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -349,7 +349,7 @@ static void ui_apply_autokey_undo(bContext *C, uiBut *but) else if(but->drawstr[0]) str= but->drawstr; else str= but->tip; - /* fallback, else we dont get an undo! */ + /* fallback, else we don't get an undo! */ if(str == NULL || str[0] == '\0') { str= "Unknown Action"; } @@ -1647,7 +1647,7 @@ static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data) int strip= BLI_utf8_invalid_strip(but->editstr, strlen(but->editstr)); /* not a file?, strip non utf-8 chars */ if(strip) { - /* wont happen often so isnt that annoying to keep it here for a while */ + /* wont happen often so isn't that annoying to keep it here for a while */ printf("%s: invalid utf8 - stripped chars %d\n", __func__, strip); } } diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 3b6648a6441..723ffb355a2 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1589,7 +1589,7 @@ void uiItemMenuF(uiLayout *layout, const char *name, int icon, uiMenuCreateFunc typedef struct MenuItemLevel { int opcontext; - /* dont use pointers to the strings because python can dynamically + /* don't use pointers to the strings because python can dynamically * allocate strings and free before the menu draws, see [#27304] */ char opname[OP_MAX_TYPENAME]; char propname[MAX_IDPROP_NAME]; diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index 5ca3f730006..80c77a54a84 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -307,7 +307,7 @@ static int reset_default_button_exec(bContext *C, wmOperator *op) } } - /* Since we dont want to undo _all_ edits to settings, eg window + /* Since we don't want to undo _all_ edits to settings, eg window * edits on the screen or on operator settings. * it might be better to move undo's inline - campbell */ if(success) { diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index b1099576505..c5abcd46437 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -617,7 +617,7 @@ static int get_panel_size_y(Panel *pa) return PNL_HEADER + pa->sizey; } -/* this function is needed because uiBlock and Panel itself dont +/* this function is needed because uiBlock and Panel itself don't * change sizey or location when closed */ static int get_panel_real_ofsy(Panel *pa) { @@ -1001,7 +1001,7 @@ static void ui_do_drag(const bContext *C, wmEvent *event, Panel *panel) /* this function is supposed to call general window drawing too */ -/* also it supposes a block has panel, and isnt a menu */ +/* also it supposes a block has panel, and isn't a menu */ static void ui_handle_panel_header(const bContext *C, uiBlock *block, int mx, int my, int event) { ScrArea *sa= CTX_wm_area(C); diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index f971410672c..a5c1bc0e659 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1282,7 +1282,7 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but, if(dir2==0) if(dir1==UI_LEFT || dir1==UI_RIGHT) dir2= UI_DOWN; if(dir2==0) if(dir1==UI_TOP || dir1==UI_DOWN) dir2= UI_LEFT; - /* no space at all? dont change */ + /* no space at all? don't change */ if(left || right) { if(dir1==UI_LEFT && left==0) dir1= UI_RIGHT; if(dir1==UI_RIGHT && right==0) dir1= UI_LEFT; diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index f868cd86db7..2b225fb56c2 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -793,9 +793,9 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, } } /* tessellation point for curve-typed objects */ else if (ELEM3(ob->type, OB_CURVE, OB_SURF, OB_FONT)) { - /* some modifiers could work with pre-tesselated curves only */ + /* some modifiers could work with pre-tessellated curves only */ if (ELEM3(md->type, eModifierType_Hook, eModifierType_Softbody, eModifierType_MeshDeform)) { - /* add disabled pre-tesselated button, so users could have + /* add disabled pre-tessellated button, so users could have * message for this modifiers */ but = uiDefIconButBitI(block, TOG, eModifierMode_ApplyOnSpline, 0, ICON_SURFACE_DATA, 0, 0, UI_UNIT_X-2, UI_UNIT_Y, &md->mode, 0.0, 0.0, 0.0, 0.0, TIP_("This modifier could be applied on splines' points only")); @@ -1579,7 +1579,7 @@ static void curvemap_buttons_zoom_out(bContext *C, void *cumap_v, void *UNUSED(u CurveMapping *cumap = cumap_v; float d, d1; - /* we allow 20 times zoom, but dont view outside clip */ + /* we allow 20 times zoom, but don't view outside clip */ if( (cumap->curr.xmax - cumap->curr.xmin) < 20.0f*(cumap->clipr.xmax - cumap->clipr.xmin) ) { d= d1= 0.15f*(cumap->curr.xmax - cumap->curr.xmin); diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 2feccf7a4e8..142584f62fd 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -161,7 +161,7 @@ static void view2d_masks(View2D *v2d) * - 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 * - 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 initialised. + * this is called before UI_view2d_size_update(), as this one checks that the rects are properly initialized. */ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy) { @@ -170,7 +170,7 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy) /* initialize data if there is a need for such */ if ((v2d->flag & V2D_IS_INITIALISED) == 0) { - /* set initialised flag so that View2D doesn't get reinitialised next time again */ + /* set initialized flag so that View2D doesn't get reinitialised next time again */ v2d->flag |= V2D_IS_INITIALISED; init= 1; diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 49dae81d985..e4726bf0ae4 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -1547,7 +1547,7 @@ static int scroller_activate_invoke(bContext *C, wmOperator *op, wmEvent *event) if ( ((vsm->scroller=='h') && (v2d->keepofs & V2D_LOCKOFS_X)) || ((vsm->scroller=='v') && (v2d->keepofs & V2D_LOCKOFS_Y)) ) { - /* free customdata initialised */ + /* free customdata initialized */ scroller_activate_exit(C, op); /* can't catch this event for ourselves, so let it go to someone else? */ @@ -1559,7 +1559,7 @@ static int scroller_activate_invoke(bContext *C, wmOperator *op, wmEvent *event) if ( ((vsm->scroller=='h') && (v2d->scroll & (V2D_SCROLL_HORIZONTAL_HIDE|V2D_SCROLL_HORIZONTAL_FULLR))) || ((vsm->scroller=='v') && (v2d->scroll & (V2D_SCROLL_VERTICAL_HIDE|V2D_SCROLL_VERTICAL_FULLR))) ) { - /* free customdata initialised */ + /* free customdata initialized */ scroller_activate_exit(C, op); /* can't catch this event for ourselves, so let it go to someone else? */ diff --git a/source/blender/editors/mesh/bmesh_utils.c b/source/blender/editors/mesh/bmesh_utils.c index 8ca5dce647f..ced878610c3 100644 --- a/source/blender/editors/mesh/bmesh_utils.c +++ b/source/blender/editors/mesh/bmesh_utils.c @@ -421,7 +421,7 @@ void EDBM_select_more(BMEditMesh *em) "regionextend geom=%hvef constrict=%b use_faces=%b", BM_ELEM_SELECT, FALSE, use_faces); BMO_op_exec(em->bm, &bmop); - /* dont flush selection in edge/vertex mode */ + /* don't flush selection in edge/vertex mode */ BMO_slot_buffer_hflag_enable(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_ALL, use_faces ? TRUE : FALSE); BMO_op_finish(em->bm, &bmop); @@ -437,7 +437,7 @@ void EDBM_select_less(BMEditMesh *em) "regionextend geom=%hvef constrict=%b use_faces=%b", BM_ELEM_SELECT, TRUE, use_faces); BMO_op_exec(em->bm, &bmop); - /* dont flush selection in edge/vertex mode */ + /* don't flush selection in edge/vertex mode */ BMO_slot_buffer_hflag_disable(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_ALL, use_faces ? TRUE : FALSE); BMO_op_finish(em->bm, &bmop); diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index bb000b2f8f5..cdbe34b4bd5 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -288,7 +288,7 @@ int ED_mesh_uv_loop_reset(struct bContext *C, struct Mesh *me) fuvs += len; } - /* BMESH_TODO: Copy poly UVs onto CD_MTFACE layer for tesselated faces */ + /* BMESH_TODO: Copy poly UVs onto CD_MTFACE layer for tessellated faces */ BLI_array_free(uvs); BLI_array_free(polylengths); @@ -762,7 +762,7 @@ void ED_mesh_update(Mesh *mesh, bContext *C, int calc_edges, int calc_tessface) if(mesh->totface > 0 && mesh->totpoly == 0) { convert_mfaces_to_mpolys(mesh); - /* would only be converting back again, dont bother */ + /* would only be converting back again, don't bother */ tessface_input = TRUE; /* it also happens that converting the faces calculates edges, skip this */ @@ -787,8 +787,8 @@ void ED_mesh_update(Mesh *mesh, bContext *C, int calc_edges, int calc_tessface) * calculate normals only for the mvert's. - campbell */ #ifdef USE_BMESH_MPOLY_NORMALS polyindex = CustomData_get_layer(&mesh->fdata, CD_POLYINDEX); - /* add a normals layer for tesselated faces, a tessface normal will - * contain the normal of the poly the face was tesselated from. */ + /* add a normals layer for tessellated faces, a tessface normal will + * contain the normal of the poly the face was tessellated from. */ face_nors = CustomData_add_layer(&mesh->fdata, CD_NORMAL, CD_CALLOC, NULL, mesh->totface); mesh_calc_normals_mapping_ex(mesh->mvert, mesh->totvert, @@ -870,7 +870,7 @@ static void mesh_add_edges(Mesh *mesh, int len) CustomData_free(&mesh->edata, mesh->totedge); mesh->edata= edata; - mesh_update_customdata_pointers(mesh, FALSE); /* new edges dont change tessellation */ + mesh_update_customdata_pointers(mesh, FALSE); /* new edges don't change tessellation */ /* set default flags */ medge= &mesh->medge[mesh->totedge]; diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 671c70c1f0f..2529b6f518f 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -1160,7 +1160,7 @@ static int pose_constraints_clear_exec(bContext *C, wmOperator *UNUSED(op)) /* force depsgraph to get recalculated since relationships removed */ DAG_scene_sort(bmain, scene); /* sort order of objects */ - /* note, calling BIK_clear_data() isnt needed here */ + /* note, calling BIK_clear_data() isn't needed here */ /* do updates */ DAG_id_tag_update(&ob->id, OB_RECALC_DATA); diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index f1222ccf7f7..dea9c1a3b6c 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -553,7 +553,7 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob, } cu = ob->data; - BKE_report(reports, RPT_INFO, "Applied modifier only changed CV points, not tesselated/bevel vertices"); + BKE_report(reports, RPT_INFO, "Applied modifier only changed CV points, not tessellated/bevel vertices"); vertexCos = curve_getVertexCos(cu, &cu->nurb, &numVerts); mti->deformVerts(md, ob, NULL, vertexCos, numVerts, 0, 0); diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index b186f788bbf..87a058334c0 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -224,7 +224,7 @@ static int object_shape_key_mirror(bContext *C, Object *ob) /* half but found up odd value */ const int pntsu_half = (lt->pntsu / 2) + (lt->pntsu % 2); - /* currently editmode isnt supported by mesh so + /* currently editmode isn't supported by mesh so * ignore here for now too */ /* if(lt->editlatt) lt= lt->editlatt->latt; */ diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index d66f16b0adb..57cc034aaaa 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -645,7 +645,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } else { - /* get the view settings if 'around' isnt set and the view is available */ + /* get the view settings if 'around' isn't set and the view is available */ View3D *v3d= CTX_wm_view3d(C); copy_v3_v3(cursor, give_cursor(scene, v3d)); if(v3d && !RNA_struct_property_is_set(op->ptr, "center")) diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 7328cbb2e7a..1e4d32de003 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -2783,7 +2783,7 @@ static int vgroup_do_remap(Object *ob, char *name_array, wmOperator *op) } } else { - BKE_report(op->reports, RPT_ERROR, "Editmode lattice isnt supported yet"); + BKE_report(op->reports, RPT_ERROR, "Editmode lattice isn't supported yet"); MEM_freeN(sort_map_update); return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index e17ce84406b..dbdee3baca8 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -674,7 +674,7 @@ static int fluid_init_filepaths(Object *fsDomain, char *targetDir, char *targetF BLI_strncpy(newSurfdataPath, domainSettings->surfdataPath, FILE_MAXDIR); /* if 0'd out below, this value is never used! */ BLI_path_abs(targetDir, relbase); // fixed #frame-no - /* .tmp: dont overwrite/delete original file */ + /* .tmp: don't overwrite/delete original file */ BLI_join_dirfile(targetFile, FILE_MAX, targetDir, suffixConfigTmp); // make sure all directories exist @@ -993,7 +993,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor } /* ******** start writing / exporting ******** */ - // use .tmp, dont overwrite/delete original file + // use .tmp, don't overwrite/delete original file BLI_join_dirfile(targetFile, sizeof(targetFile), targetDir, suffixConfigTmp); // make sure these directories exist as well diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 4fbc5085b2d..c104b498095 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -609,7 +609,7 @@ void RENDER_OT_render(wmOperatorType *ot) ot->modal= screen_render_modal; ot->exec= screen_render_exec; - /*ot->poll= ED_operator_screenactive;*/ /* this isnt needed, causes failer in background mode */ + /*ot->poll= ED_operator_screenactive;*/ /* this isn't needed, causes failer in background mode */ RNA_def_boolean(ot->srna, "animation", 0, "Animation", "Render files from the animation range of this scene"); RNA_def_boolean(ot->srna, "write_still", 0, "Write Image", "Save rendered the image to the output path (used only when animation is disabled)"); diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 79832e2a9d1..c36ec5a90dd 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -439,7 +439,7 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op) Object *camera= NULL; /* update animated image textures for gpu, etc, - * call before scene_update_for_newframe so modifiers with textuers dont lag 1 frame */ + * call before scene_update_for_newframe so modifiers with textuers don't lag 1 frame */ ED_image_update_frame(bmain, scene->r.cfra); /* go to next frame */ diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 57b65ad5223..d744149bf9c 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1703,7 +1703,7 @@ void ED_region_panels_init(wmWindowManager *wm, ARegion *ar) ar->v2d.scroll &= ~V2D_SCROLL_VERTICAL_HIDE; ar->v2d.keepzoom |= V2D_KEEPZOOM; - // correctly initialised User-Prefs? + // correctly initialized User-Prefs? if(!(ar->v2d.align & V2D_ALIGN_NO_POS_Y)) ar->v2d.flag &= ~V2D_IS_INITIALISED; diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 4ed6e08fb31..3f8f786489c 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1819,7 +1819,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 dont lag 1 frame */ + * call before scene_update_for_newframe so modifiers with textuers 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/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index a2ad3c4480b..956251d7bb9 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -894,7 +894,7 @@ static int project_bucket_point_occluded(const ProjPaintState *ps, LinkNode *buc else isect_ret = project_paint_occlude_ptv(pixelScreenCo, ps->screenCoords[mf->v1], ps->screenCoords[mf->v2], ps->screenCoords[mf->v3], w, ps->is_ortho); - /* Note, if isect_ret==-1 then we dont want to test the other side of the quad */ + /* Note, if isect_ret==-1 then we don't want to test the other side of the quad */ if (isect_ret==0 && mf->v4) { if(do_clip) isect_ret = project_paint_occlude_ptv_clip(ps, mf, pixelScreenCo, ps->screenCoords[mf->v1], ps->screenCoords[mf->v3], ps->screenCoords[mf->v4], 1); @@ -1352,7 +1352,7 @@ static void project_face_pixel(const MTFace *tf_other, ImBuf *ibuf_other, const } -/* run this outside project_paint_uvpixel_init since pixels with mask 0 dont need init */ +/* run this outside project_paint_uvpixel_init since pixels with mask 0 don't need init */ static float project_paint_uvpixel_mask( const ProjPaintState *ps, const int face_index, @@ -1452,7 +1452,7 @@ static float project_paint_uvpixel_mask( } // This only works when the opacity dosnt change while painting, stylus pressure messes with this - // so dont use it. + // so don't use it. // if (ps->is_airbrush==0) mask *= brush_alpha(ps->brush); return mask; @@ -1506,7 +1506,7 @@ static ProjPixel *project_paint_uvpixel_init( projPixel->origColor.uint = projPixel->newColor.uint = *projPixel->pixel.uint_pt; } - /* screenspace unclamped, we could keep its z and w values but dont need them at the moment */ + /* screenspace unclamped, we could keep its z and w values but don't need them at the moment */ copy_v2_v2(projPixel->projCoSS, pixelScreenCo); projPixel->x_px = x_px; @@ -1745,7 +1745,7 @@ static int line_clip_rect2f( /* scale the quad & tri about its center * scaling by PROJ_FACE_SCALE_SEAM (0.99x) is used for getting fake UV pixel coords that are on the - * edge of the face but slightly inside it occlusion tests dont return hits on adjacent faces */ + * edge of the face but slightly inside it occlusion tests don't return hits on adjacent faces */ #ifndef PROJ_DEBUG_NOSEAMBLEED static void scale_quad(float insetCos[4][3], float *origCos[4], const float inset) { @@ -1984,7 +1984,7 @@ static void project_bucket_clip_face( inside_bucket_flag |= BLI_in_rctf(bucket_bounds, v3coSS[0], v3coSS[1]) << 2; if (inside_bucket_flag == ISECT_ALL3) { - /* all screenspace points are inside the bucket bounding box, this means we dont need to clip and can simply return the UVs */ + /* all screenspace points are inside the bucket bounding box, this means we don't need to clip and can simply return the UVs */ if (flip) { /* facing the back? */ copy_v2_v2(bucket_bounds_uv[0], uv3co); copy_v2_v2(bucket_bounds_uv[1], uv2co); @@ -2641,7 +2641,7 @@ static void project_paint_face_init(const ProjPaintState *ps, const int thread_i else { barycentric_weights_v2(tf_uv_pxoffset[0], tf_uv_pxoffset[1], tf_uv_pxoffset[2], uv_close, w); } -#else /* this is buggy with quads, dont use for now */ +#else /* this is buggy with quads, don't use for now */ /* Cheat, we know where we are along the edge so work out the weights from that */ fac = fac1 + (fac * (fac2-fac1)); @@ -2852,7 +2852,7 @@ static int project_bucket_face_isect(ProjPaintState *ps, int bucket_x, int bucke return 0; } -/* Add faces to the bucket but dont initialize its pixels +/* Add faces to the bucket but don't initialize its pixels * TODO - when painting occluded, sort the faces on their min-Z and only add faces that faces that are not occluded */ static void project_paint_delayed_face_init(ProjPaintState *ps, const MFace *mf, const int face_index) { @@ -3509,7 +3509,7 @@ static void project_paint_end(ProjPaintState *ps) if(ps->dm->type != DM_TYPE_CDDM) { if(ps->dm_mvert) MEM_freeN(ps->dm_mvert); if(ps->dm_mface) MEM_freeN(ps->dm_mface); - /* looks like these dont need copying */ + /* looks like these don't need copying */ #if 0 if(ps->dm_mtface) MEM_freeN(ps->dm_mtface); if(ps->dm_mtface_clone) MEM_freeN(ps->dm_mtface_clone); @@ -3593,7 +3593,7 @@ static int project_bucket_iter_init(ProjPaintState *ps, const float mval_f[2]) float min_brush[2], max_brush[2]; const float radius = (float)brush_size(ps->scene, ps->brush); - /* so we dont have a bucket bounds that is way too small to paint into */ + /* so we don't have a bucket bounds that is way too small to paint into */ // if (radius < 1.0f) radius = 1.0f; // this doesn't work yet :/ min_brush[0] = mval_f[0] - radius; @@ -3964,12 +3964,12 @@ static void *do_projectpaint_thread(void *ph_v) case PAINT_TOOL_CLONE: if (is_floatbuf) { if (((ProjPixelClone *)projPixel)->clonepx.f[3]) { - do_projectpaint_clone_f(ps, projPixel, alpha, mask); /* rgba isnt used for cloning, only alpha */ + do_projectpaint_clone_f(ps, projPixel, alpha, mask); /* rgba isn't used for cloning, only alpha */ } } else { if (((ProjPixelClone*)projPixel)->clonepx.ch[3]) { - do_projectpaint_clone(ps, projPixel, alpha, mask); /* rgba isnt used for cloning, only alpha */ + do_projectpaint_clone(ps, projPixel, alpha, mask); /* rgba isn't used for cloning, only alpha */ } } break; @@ -4711,7 +4711,7 @@ typedef struct PaintOperation { int first; int prevmouse[2]; - float prev_pressure; /* need this since we dont get tablet events for pressure change */ + float prev_pressure; /* need this since we don't get tablet events for pressure change */ int orig_brush_size; double starttime; @@ -4880,7 +4880,7 @@ static int texture_paint_init(bContext *C, wmOperator *op) if (pop->ps.ob==NULL || !(pop->ps.ob->lay & pop->ps.v3d->lay)) return 0; - /* Dont allow brush size below 2 */ + /* Don't allow brush size below 2 */ if (brush_size(scene, brush) < 2) brush_set_size(scene, brush, 2); diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 68153c6e760..3a6a9dd6548 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -103,7 +103,7 @@ static int vertex_paint_use_fast_update_check(Object *ob) } /* if the polygons from the mesh and the 'derivedFinal' match - * we can assume that no modifiers are applied and that its worth adding tesselated faces + * we can assume that no modifiers are applied and that its worth adding tessellated faces * so 'vertex_paint_use_fast_update_check()' returns TRUE */ static int vertex_paint_use_tessface_check(Object *ob) { @@ -189,7 +189,7 @@ unsigned int vpaint_get_current_col(VPaint *vp) Brush *brush = paint_brush(&vp->paint); unsigned char col[4]; rgb_float_to_uchar(col, brush->rgb); - col[3] = 255; /* alpha isnt used, could even be removed to speedup paint a little */ + col[3] = 255; /* alpha isn't used, could even be removed to speedup paint a little */ return *(unsigned int *)col; } @@ -2177,7 +2177,7 @@ static int wpaint_stroke_test_start(bContext *C, wmOperator *op, wmEvent *UNUSED ED_vgroup_add(ob); } - /* ensure we dont try paint onto an invalid group */ + /* ensure we don't try paint onto an invalid group */ if (ob->actdef <= 0) { BKE_report(op->reports, RPT_WARNING, "No active vertex group for painting, aborting"); return FALSE; @@ -2251,7 +2251,7 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P const float brush_alpha_value = brush_alpha(scene, brush); const float brush_alpha_pressure = brush_alpha_value * (brush_use_alpha_pressure(scene, brush) ? pressure : 1.0f); - /* intentionally dont initialize as NULL, make sure we initialize all members below */ + /* intentionally don't initialize as NULL, make sure we initialize all members below */ WeightPaintInfo wpi; /* cannot paint if there is no stroke data */ @@ -2415,7 +2415,7 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P /* *** free wpi members */ MEM_freeN((void *)wpi.defbase_sel); - /* *** dont freeing wpi members */ + /* *** don't freeing wpi members */ swap_m4m4(vc->rv3d->persmat, mat); diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c index b52bc75eac8..36bb10ec21f 100644 --- a/source/blender/editors/space_console/console_ops.c +++ b/source/blender/editors/space_console/console_ops.c @@ -614,7 +614,7 @@ static int console_history_append_exec(bContext *C, wmOperator *op) ARegion *ar= CTX_wm_region(C); ScrArea *sa= CTX_wm_area(C); ConsoleLine *ci= console_history_verify(C); - char *str= RNA_string_get_alloc(op->ptr, "text", NULL, 0); /* own this text in the new line, dont free */ + char *str= RNA_string_get_alloc(op->ptr, "text", NULL, 0); /* own this text in the new line, don't free */ int cursor= RNA_int_get(op->ptr, "current_character"); short rem_dupes= RNA_boolean_get(op->ptr, "remove_duplicates"); int prev_len= ci->len; @@ -671,7 +671,7 @@ static int console_scrollback_append_exec(bContext *C, wmOperator *op) ARegion *ar= CTX_wm_region(C); ConsoleLine *ci; - char *str= RNA_string_get_alloc(op->ptr, "text", NULL, 0); /* own this text in the new line, dont free */ + char *str= RNA_string_get_alloc(op->ptr, "text", NULL, 0); /* own this text in the new line, don't free */ int type= RNA_enum_get(op->ptr, "type"); console_history_verify(C); diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index f0baa6acf8c..5bc62620dfa 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -677,7 +677,7 @@ int filelist_find(struct FileList* filelist, const char *filename) for (i = 0; i < filelist->numfiles; ++i) { - if ( strcmp(filelist->filelist[i].relname, filename) == 0) { /* not dealing with user input so dont need BLI_path_cmp */ + if ( strcmp(filelist->filelist[i].relname, filename) == 0) { /* not dealing with user input so don't need BLI_path_cmp */ index = i; break; } diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index 46de1254f41..3c2ebea5c28 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -80,7 +80,7 @@ static void image_verify_buffer_float(Image *ima, ImBuf *ibuf, int color_manage) { /* detect if we need to redo the curve map. * ibuf->rect is zero for compositor and render results after change - * convert to 32 bits always... drawing float rects isnt supported well (atis) + * convert to 32 bits always... drawing float rects isn't supported well (atis) * * NOTE: if float buffer changes, we have to manually remove the rect */ diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index ae47125fa84..6271dbece35 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1069,7 +1069,7 @@ static int save_image_options_init(SaveImageOptions *simopts, SpaceImage *sima, simopts->im_format.depth= imtype_best_depth(ibuf, simopts->im_format.imtype); } - /* some formats dont use quality so fallback to scenes quality */ + /* some formats don't use quality so fallback to scenes quality */ if (simopts->im_format.quality == 0) { simopts->im_format.quality= scene->r.im_format.quality; } diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 46850d4ff60..3d5dc454768 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -673,7 +673,7 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN BLI_strncpy(showname, nodeLabel(node), sizeof(showname)); //if(node->flag & NODE_MUTED) - // BLI_snprintf(showname, sizeof(showname), "[%s]", showname); // XXX - dont print into self! + // BLI_snprintf(showname, sizeof(showname), "[%s]", showname); // XXX - don't print into self! uiDefBut(node->block, LABEL, 0, showname, (short)(rct->xmin+15), (short)(rct->ymax-NODE_DY), (int)(iconofs - rct->xmin-18.0f), NODE_DY, NULL, 0, 0, 0, 0, ""); @@ -831,7 +831,7 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b BLI_strncpy(showname, nodeLabel(node), sizeof(showname)); //if(node->flag & NODE_MUTED) - // BLI_snprintf(showname, sizeof(showname), "[%s]", showname); // XXX - dont print into self! + // BLI_snprintf(showname, sizeof(showname), "[%s]", showname); // XXX - don't print into self! uiDefBut(node->block, LABEL, 0, showname, (short)(rct->xmin+15), (short)(centy-10), (int)(rct->xmax - rct->xmin-18.0f -12.0f), NODE_DY, NULL, 0, 0, 0, 0, ""); diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 235e8e6c605..4adbd32cf37 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -2168,7 +2168,7 @@ static int node_duplicate_exec(bContext *C, wmOperator *op) newnode = nodeCopyNode(ntree, node); if(newnode->id) { - /* simple id user adjustment, node internal functions dont touch this + /* simple id user adjustment, node internal functions don't touch this * but operators and readfile.c do. */ id_us_plus(newnode->id); /* to ensure redraws or rerenders happen */ diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index f0115170525..12b93e17f9f 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1217,7 +1217,7 @@ static void outliner_draw_iconrow(bContext *C, uiBlock *block, Scene *scene, Spa (*offsx) += UI_UNIT_X; } - /* this tree element always has same amount of branches, so dont draw */ + /* this tree element always has same amount of branches, so don't draw */ if(tselem->type!=TSE_R_LAYER) outliner_draw_iconrow(C, block, scene, soops, &te->subtree, level+1, xmax, offsx, ys); } @@ -1251,7 +1251,7 @@ static void outliner_draw_tree_element(bContext *C, uiBlock *block, Scene *scene if(*starty+2*UI_UNIT_Y >= ar->v2d.cur.ymin && *starty<= ar->v2d.cur.ymax) { int xmax= ar->v2d.cur.xmax; - /* icons can be ui buts, we dont want it to overlap with restrict */ + /* icons can be ui buts, we don't want it to overlap with restrict */ if((soops->flag & SO_HIDE_RESTRICTCOLS)==0) xmax-= OL_TOGW+UI_UNIT_X; @@ -1393,7 +1393,7 @@ static void outliner_draw_tree_element(bContext *C, uiBlock *block, Scene *scene if(!TSELEM_OPEN(tselem,soops)) { if(te->subtree.first) { if(tselem->type==0 && te->idcode==ID_SCE); - else if(tselem->type!=TSE_R_LAYER) { /* this tree element always has same amount of branches, so dont draw */ + else if(tselem->type!=TSE_R_LAYER) { /* this tree element always has same amount of branches, so don't draw */ int tempx= startx+offsx; // divider diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index b44e363090f..c7587935cb3 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -413,7 +413,7 @@ void outliner_do_object_operation(bContext *C, Scene *scene_act, SpaceOops *soop } /* important to use 'scene_owner' not scene_act else deleting objects can crash. * only use 'scene_act' when 'scene_owner' is NULL, which can happen when the - * outliner isnt showing scenes: Visible Layer draw mode for eg. */ + * outliner isn't showing scenes: Visible Layer draw mode for eg. */ operation_cb(C, scene_owner ? scene_owner : scene_act, te, NULL, tselem); } } diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 56cfcf9e18a..d8a9e75ebc6 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1284,7 +1284,7 @@ static void outliner_sort(SpaceOops *soops, ListBase *lb) tp->te= te; tp->name= te->name; tp->idcode= te->idcode; - if(tselem->type && tselem->type!=TSE_DEFGROUP) tp->idcode= 0; // dont sort this + if(tselem->type && tselem->type!=TSE_DEFGROUP) tp->idcode= 0; // don't sort this tp->id= tselem->id; } /* keep beginning of list */ diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 96e837eb95b..e4df13bc00c 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -123,7 +123,7 @@ static void sequencer_generic_invoke_xy__internal(bContext *C, wmOperator *op, w UI_view2d_region_to_view(v2d, event->mval[0], event->mval[1], &mval_v2d[0], &mval_v2d[1]); - /* effect strips dont need a channel initialized from the mouse */ + /* effect strips don't need a channel initialized from the mouse */ if(!(flag & SEQPROP_NOCHAN)) { RNA_int_set(op->ptr, "channel", (int)mval_v2d[1]+0.5f); } @@ -149,7 +149,7 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, wmOperator *op) seq_load->end_frame= seq_load->start_frame; /* un-set */ seq_load->channel= RNA_int_get(op->ptr, "channel"); - seq_load->len= 1; // images only, if endframe isnt set! + seq_load->len= 1; // images only, if endframe isn't set! if(RNA_struct_find_property(op->ptr, "filepath")) { RNA_string_get(op->ptr, "filepath", seq_load->path); /* full path, file is set by the caller */ diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 1bbf4b670b5..a9c32b4dfde 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -72,7 +72,7 @@ #define SEQ_RIGHTHANDLE 2 -/* Note, Dont use SEQ_BEGIN/SEQ_END while drawing! +/* Note, Don't use SEQ_BEGIN/SEQ_END while drawing! * it messes up transform, - Campbell */ static void draw_shadedstrip(Sequence *seq, unsigned char col[3], float x1, float y1, float x2, float y2); diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 049e11a4f6a..62bbe09c4d8 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -409,7 +409,7 @@ Sequence *find_nearest_seq(Scene *scene, View2D *v2d, int *hand, const int mval[ handsize = seq->handsize; displen = (float)abs(seq->startdisp - seq->enddisp); - if (displen / pixelx > 16) { /* dont even try to grab the handles of small strips */ + if (displen / pixelx > 16) { /* don't even try to grab the handles of small strips */ /* Set the max value to handle to 1/3 of the total len when its less then 28. * This is important because otherwise selecting handles happens even when you click in the middle */ @@ -1051,7 +1051,7 @@ static int sequencer_snap_exec(bContext *C, wmOperator *op) } /* test for effects and overlap - * dont use SEQP_BEGIN since that would be recursive */ + * don't use SEQP_BEGIN since that would be recursive */ for(seq= ed->seqbasep->first; seq; seq= seq->next) { if(seq->flag & SELECT && !(seq->depth==0 && seq->flag & SEQ_LOCK)) { seq->flag &= ~SEQ_OVERLAP; @@ -1729,7 +1729,7 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) while (seq) { if((seq->flag & SELECT) && (seq->type == SEQ_IMAGE) && (seq->len > 1)) { - /* remove seq so overlap tests dont conflict, + /* remove seq so overlap tests don't conflict, * see seq_free_sequence below for the real free'ing */ BLI_remlink(ed->seqbasep, seq); /* if(seq->ipo) seq->ipo->id.us--; */ @@ -1981,7 +1981,7 @@ static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op)) recurs_del_seq_flag(scene, ed->seqbasep, SEQ_FLAG_DELETE, 0); /* test for effects and overlap - * dont use SEQP_BEGIN since that would be recursive */ + * don't use SEQP_BEGIN since that would be recursive */ for(seq= ed->seqbasep->first; seq; seq= seq->next) { if(seq->flag & SELECT) { seq->flag &= ~SEQ_OVERLAP; @@ -2871,7 +2871,7 @@ static int sequencer_change_effect_input_exec(bContext *C, wmOperator *op) update_changed_seq_and_deps(scene, seq, 0, 1); - /* important else we dont get the imbuf cache flushed */ + /* important else we don't get the imbuf cache flushed */ free_imbuf_seq(scene, &ed->seqbase, FALSE, FALSE); WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene); @@ -2931,7 +2931,7 @@ static int sequencer_change_effect_type_exec(bContext *C, wmOperator *op) /* update */ update_changed_seq_and_deps(scene, seq, 0, 1); - /* important else we dont get the imbuf cache flushed */ + /* important else we don't get the imbuf cache flushed */ free_imbuf_seq(scene, &ed->seqbase, FALSE, FALSE); WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene); @@ -2997,13 +2997,13 @@ static int sequencer_change_path_exec(bContext *C, wmOperator *op) /* reset these else we wont see all the images */ seq->anim_startofs= seq->anim_endofs= 0; - /* correct start/end frames so we dont move + /* correct start/end frames so we don't move * important not to set seq->len= len; allow the function to handle it */ reload_sequence_new_file(scene, seq, TRUE); calc_sequence(scene, seq); - /* important else we dont get the imbuf cache flushed */ + /* important else we don't get the imbuf cache flushed */ free_imbuf_seq(scene, &ed->seqbase, FALSE, FALSE); } else { diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 32ccccd84d0..44b83ba0694 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -536,7 +536,7 @@ void SEQUENCER_OT_select(wmOperatorType *ot) /* properties */ RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the selection"); RNA_def_boolean(ot->srna, "linked_handle", 0, "Linked Handle", "Select handles next to the active strip"); - /* for animation this is an enum but atm having an enum isnt useful for us */ + /* for animation this is an enum but atm having an enum isn't useful for us */ RNA_def_boolean(ot->srna, "left_right", 0, "Left/Right", "Select based on the current frame side the cursor is on"); RNA_def_boolean(ot->srna, "linked_time", 0, "Linked Time", "Select other strips at the same time"); } diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index e9062b052e6..1c8ff4639cf 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -1615,7 +1615,7 @@ static void draw_brackets(SpaceText *st, ARegion *ar) find= -b; stack= 0; - /* Dont highlight backets if syntax HL is off or bracket in string or comment. */ + /* Don't highlight backets if syntax HL is off or bracket in string or comment. */ if(!linep->format || linep->format[fc] == 'l' || linep->format[fc] == '#') return; @@ -1854,7 +1854,7 @@ void text_update_character_width(SpaceText *st) } /* Moves the view to the cursor location, - * also used to make sure the view isnt outside the file */ + * also used to make sure the view isn't outside the file */ void text_scroll_to_cursor(SpaceText *st, ScrArea *sa) { Text *text; diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 17857275d36..2f6e5082fdc 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -598,7 +598,7 @@ static int text_run_script(bContext *C, ReportList *reports) return OPERATOR_FINISHED; } - /* Dont report error messages while live editing */ + /* Don't report error messages while live editing */ if(!is_live) { if(text->curl != curl_prev || curc_prev != text->curc) { text_update_cursor_moved(C); @@ -1109,7 +1109,7 @@ static int text_convert_whitespace_exec(bContext *C, wmOperator *op) for(a=0; a < strlen(text_check_line); a++) { //foreach char in line if(text_check_line[a] == '\t') { //checking for tabs //get the number of spaces this tabs is showing - //i dont like doing it this way but will look into it later + //i don't like doing it this way but will look into it later new_line[j] = '\0'; number = flatten_string(st, &fs, new_line); flatten_string_free(&fs); diff --git a/source/blender/editors/space_view3d/drawanimviz.c b/source/blender/editors/space_view3d/drawanimviz.c index e15252056cc..545ec42e72f 100644 --- a/source/blender/editors/space_view3d/drawanimviz.c +++ b/source/blender/editors/space_view3d/drawanimviz.c @@ -79,7 +79,7 @@ void draw_motion_paths_init(View3D *v3d, ARegion *ar) } /* Draw the given motion path for an Object or a Bone - * - assumes that the viewport has already been initialised properly + * - assumes that the viewport has already been initialized properly * i.e. draw_motion_paths_init() has been called */ void draw_motion_path_instance(Scene *scene, @@ -210,7 +210,7 @@ void draw_motion_path_instance(Scene *scene, UI_ThemeColor(TH_TEXT_HI); } - // XXX, this isnt up to date but probably should be kept so. + // XXX, this isn't up to date but probably should be kept so. invert_m4_m4(ob->imat, ob->obmat); /* Draw frame numbers at each framestep value */ diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 373b665a84c..0f3110c478f 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -1864,7 +1864,7 @@ static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base, if (index != -1) index+= 0x10000; // pose bones count in higher 2 bytes only } - /* stick or wire bones have not been drawn yet so dont clear object selection in this case */ + /* stick or wire bones have not been drawn yet so don't clear object selection in this case */ if (ELEM(arm->drawtype, ARM_LINE, ARM_WIRE)==0 && draw_wire) { /* object tag, for bordersel optim */ glLoadName(index & 0xFFFF); diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 765114e2fb4..a8f5aff2e1c 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -193,7 +193,7 @@ static int check_ob_drawface_dot(Scene *sce, View3D *vd, char dt) if ((vd->flag & V3D_ZBUF_SELECT) == 0) return 1; - /* if its drawing textures with zbuf sel, then dont draw dots */ + /* if its drawing textures with zbuf sel, then don't draw dots */ if (dt==OB_TEXTURE && vd->drawtype==OB_TEXTURE) return 0; @@ -2016,7 +2016,7 @@ static void drawlattice(Scene *scene, View3D *v3d, Object *ob) /* Note! - foreach funcs should be called while drawing or directly after * if not, ED_view3d_init_mats_rv3d() can be used for selection tools - * but would not give correct results with dupli's for eg. which dont + * but would not give correct results with dupli's for eg. which don't * use the object matrix in the usual way */ static void mesh_foreachScreenVert__mapFunc(void *userData, int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s)) { @@ -2721,7 +2721,7 @@ static void draw_em_fancy_edges(BMEditMesh *em, Scene *scene, View3D *v3d, UI_GetThemeColor4ubv(TH_WIRE, wireCol); UI_GetThemeColor4ubv(TH_EDITMESH_ACTIVE, actCol); - /* when sel only is used, dont render wire, only selected, this is used for + /* when sel only is used, don't render wire, only selected, this is used for * textured draw mode when the 'edges' option is disabled */ if (sel_only) wireCol[3] = 0; @@ -3084,7 +3084,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, glEnable(GL_BLEND); glDepthMask(0); // disable write in zbuffer, needed for nice transp - /* dont draw unselected faces, only selected, this is MUCH nicer when texturing */ + /* don't draw unselected faces, only selected, this is MUCH nicer when texturing */ if (CHECK_OB_DRAWTEXTURE(v3d, dt)) col1[3] = 0; @@ -3098,7 +3098,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, * Make all other faces zero alpha except for the active * */ unsigned char col1[4], col2[4], col3[4]; - col1[3] = col2[3] = 0; /* dont draw */ + col1[3] = col2[3] = 0; /* don't draw */ UI_GetThemeColor4ubv(TH_EDITMESH_ACTIVE, col3); glEnable(GL_BLEND); @@ -3113,7 +3113,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, /* here starts all fancy draw-extra over */ if ((me->drawflag & ME_DRAWEDGES)==0 && CHECK_OB_DRAWTEXTURE(v3d, dt)) { - /* we are drawing textures and 'ME_DRAWEDGES' is disabled, dont draw any edges */ + /* we are drawing textures and 'ME_DRAWEDGES' is disabled, don't draw any edges */ /* only draw selected edges otherwise there is no way of telling if a face is selected */ draw_em_fancy_edges(em, scene, v3d, me, cageDM, 1, eed_act); @@ -3318,7 +3318,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D GPU_disable_material(); - /* since we already draw wire as wp guide, dont draw over the top */ + /* since we already draw wire as wp guide, don't draw over the top */ draw_wire= OBDRAW_WIRE_OFF; } else if (draw_flags & DRAW_MODIFIERS_PREVIEW) { @@ -5135,7 +5135,7 @@ static void tekenhandlesN(Nurb *nu, short sel, short hide_handles) if (nu->type == CU_BEZIER) { #define TH_HANDLE_COL_TOT ((TH_HANDLE_SEL_FREE - TH_HANDLE_FREE) + 1) - /* use MIN2 when indexing to ensure newer files dont read outside the array */ + /* use MIN2 when indexing to ensure newer files don't read outside the array */ unsigned char handle_cols[TH_HANDLE_COL_TOT][3]; const int basecol= sel ? TH_HANDLE_SEL_FREE : TH_HANDLE_FREE; @@ -5510,7 +5510,7 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, if (v3d->zbuf) glEnable(GL_DEPTH_TEST); /* direction vectors for 3d curve paths - * when at its lowest, dont render normals */ + * when at its lowest, don't render normals */ if ((cu->flag & CU_3D) && (ts->normalsize > 0.0015f) && (cu->drawflag & CU_HIDE_NORMALS)==0) { UI_ThemeColor(TH_WIRE); @@ -6945,7 +6945,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) } if (dtx & OB_DRAWNAME) { /* patch for several 3d cards (IBM mostly) that crash on glSelect with text drawing */ - /* but, we also dont draw names for sets or duplicators */ + /* but, we also don't draw names for sets or duplicators */ if (flag == 0) { float zero[3]= {0,0,0}; float curcol[4]; @@ -6999,7 +6999,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) int do_draw_center= -1; /* defines below are zero or positive... */ if (v3d->flag2 & V3D_RENDER_OVERRIDE) { - /* dont draw */ + /* don't draw */ } else if ((scene->basact)==base) do_draw_center= ACTIVE; diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 3d570252126..dbd4a4107f8 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -541,7 +541,7 @@ static void drawcursor(Scene *scene, ARegion *ar, View3D *v3d) int mx, my, co[2]; int flag; - /* we dont want the clipping for cursor */ + /* we don't want the clipping for cursor */ flag= v3d->flag; v3d->flag= 0; project_int(ar, give_cursor(scene, v3d), co); @@ -2097,7 +2097,7 @@ void draw_depth(Scene *scene, ARegion *ar, View3D *v3d, int (* func)(void *)) } } - /* this isnt that nice, draw xray objects as if they are normal */ + /* this isn't that nice, draw xray objects as if they are normal */ if ( v3d->afterdraw_transp.first || v3d->afterdraw_xray.first || v3d->afterdraw_xraytransp.first diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index e27cd760c92..c04f352a5d0 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -476,7 +476,7 @@ static void viewops_data_create(bContext *C, wmOperator *op, wmEvent *event) ED_view3d_win_to_vector(vod->ar, mval_f, vod->mousevec); } - /* lookup, we dont pass on v3d to prevent confusement */ + /* lookup, we don't pass on v3d to prevent confusement */ vod->grid= vod->v3d->grid; vod->far= vod->v3d->far; @@ -2202,7 +2202,7 @@ static int viewselected_exec(bContext *C, wmOperator *UNUSED(op)) size= MAX3(afm[0], afm[1], afm[2]); if (!rv3d->is_persp) { - if (size < 0.0001f) { /* if its a sinble point. dont even re-scale */ + if (size < 0.0001f) { /* if its a sinble point. don't even re-scale */ ok_dist= 0; } else { @@ -2813,7 +2813,7 @@ static int viewnumpad_exec(bContext *C, wmOperator *op) } } - /* if the camera isnt found, check a number of options */ + /* if the camera isn't found, check a number of options */ if (v3d->camera==NULL && ob && ob->type==OB_CAMERA) v3d->camera= ob; @@ -2824,7 +2824,7 @@ static int viewnumpad_exec(bContext *C, wmOperator *op) if (v3d->camera==NULL) return OPERATOR_CANCELLED; - /* important these dont get out of sync for locked scenes */ + /* important these don't get out of sync for locked scenes */ if (v3d->scenelock) scene->camera= v3d->camera; diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 53b64b971aa..6e5a3b2dc54 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -813,7 +813,7 @@ static int flyApply(bContext *C, FlyInfo *fly) /* scale the mouse movement by this value - scales mouse movement to the view size * moffset[0]/(ar->winx-xmargin*2) - window size minus margin (same for y) * - * the mouse moves isnt linear */ + * the mouse moves isn't linear */ if (moffset[0]) { moffset[0] /= ar->winx - (xmargin * 2); @@ -834,7 +834,7 @@ static int flyApply(bContext *C, FlyInfo *fly) float dvec_tmp[3]; /* time how fast it takes for us to redraw, - * this is so simple scenes dont fly too fast */ + * this is so simple scenes don't fly too fast */ double time_current; float time_redraw; float time_redraw_clamped; @@ -946,12 +946,12 @@ static int flyApply(bContext *C, FlyInfo *fly) fly->zlock_momentum += FLY_ZUP_CORRECT_ACCEL; } else { - fly->zlock = 1; /* dont check until the view rotates again */ + fly->zlock = 1; /* don't check until the view rotates again */ fly->zlock_momentum = 0.0f; } } - if (fly->xlock == 2 && moffset[1] == 0) { /*only apply xcorrect when mouse isnt applying x rot*/ + if (fly->xlock == 2 && moffset[1] == 0) { /*only apply xcorrect when mouse isn't applying x rot*/ upvec[0] = 0; upvec[1] = 0; upvec[2] = 1; diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 17f5ab68633..6e0a87977ee 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -527,7 +527,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) uiItemR(row, &v3dptr, "pivot_point", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); /* pose/object only however we want to allow in weight paint mode too - * so dont be totally strict and just check not-editmode for now */ + * so don't be totally strict and just check not-editmode for now */ if (obedit == NULL) { uiItemR(row, &v3dptr, "use_pivot_point_align", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); } diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 3d1156c8ad1..a7c711968aa 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -529,7 +529,7 @@ static void do_lasso_select_mesh(ViewContext *vc, int mcords[][2], short moves, if (extend == 0 && select) EDBM_flag_disable_all(vc->em, BM_ELEM_SELECT); - /* for non zbuf projections, dont change the GL state */ + /* for non zbuf projections, don't change the GL state */ ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); glLoadMatrixf(vc->rv3d->viewmat); @@ -1086,7 +1086,7 @@ static EnumPropertyItem *object_select_menu_enum_itemf(bContext *C, PointerRNA * int totitem= 0; int i= 0; - /* dont need context but avoid docgen using this */ + /* don't need context but avoid docgen using this */ if (C == NULL || object_mouse_select_menu_data[i].idname[0] == '\0') { return DummyRNA_NULL_items; } @@ -1800,7 +1800,7 @@ static int do_mesh_box_select(ViewContext *vc, rcti *rect, int select, int exten if (extend == 0 && select) EDBM_flag_disable_all(vc->em, BM_ELEM_SELECT); - /* for non zbuf projections, dont change the GL state */ + /* for non zbuf projections, don't change the GL state */ ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); glLoadMatrixf(vc->rv3d->viewmat); diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 88658b30662..7bd878351d9 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -145,7 +145,7 @@ void smooth_view(bContext *C, View3D *v3d, ARegion *ar, Object *oldcamera, Objec * we may be changing the view 'as if' there is no active camera, but infact * there is an active camera which is locked to the view. * - * In the case where smooth view is moving _to_ a camera we dont want that + * In the case where smooth view is moving _to_ a camera we don't want that * camera to be moved or changed, so only when the camera is not being set should * we allow camera option locking to initialize the view settings from the camera. */ @@ -1075,7 +1075,7 @@ static void obmat_to_viewmat(View3D *v3d, RegionView3D *rv3d, Object *ob, short float bmat[4][4]; float tmat[3][3]; - rv3d->view= RV3D_VIEW_USER; /* dont show the grid */ + rv3d->view= RV3D_VIEW_USER; /* don't show the grid */ copy_m4_m4(bmat, ob->obmat); normalize_m4(bmat); @@ -1150,7 +1150,7 @@ int ED_view3d_lock(RegionView3D *rv3d) return TRUE; } -/* dont set windows active in here, is used by renderwin too */ +/* don't set windows active in here, is used by renderwin too */ void setviewmatrixview3d(Scene *scene, View3D *v3d, RegionView3D *rv3d) { if (rv3d->persp==RV3D_CAMOB) { /* obs/camera */ diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index c62bac7d5c7..4382889ff74 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4665,7 +4665,7 @@ void projectSVData(TransInfo *t, int final) /* BMESH_TODO, (t->settings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT) * currently all vertex data is interpolated which is nice mostly - * except for shape keys where you dont want to modify UVs for eg. + * except for shape keys where you don't want to modify UVs for eg. * current BMesh code doesnt make it easy to pick which data we interpolate * - campbell */ diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 595edf053b8..20a51945b95 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -1585,7 +1585,7 @@ static void createTransCurveVerts(bContext *C, TransInfo *t) calc_distanceCurveVerts(head, tail-1); /* TODO - in the case of tilt and radius we can also avoid allocating the initTransDataCurveHandles - * but for now just dont change handle types */ + * but for now just don't change handle types */ if (ELEM(t->mode, TFM_CURVE_SHRINKFATTEN, TFM_TILT) == 0) { /* sets the handles based on their selection, do this after the data is copied to the TransData */ testhandlesNurb(nu); @@ -2337,7 +2337,7 @@ void flushTransSeq(TransInfo *t) if(seq->depth==0) { /* Calculate this strip and all nested strips * children are ALWAYS transformed first - * so we dont need to do this in another loop. */ + * so we don't need to do this in another loop. */ calc_sequence(t->scene, seq); } else { @@ -3838,7 +3838,7 @@ void flushTransGraphData(TransInfo *t) /* ******************* Sequencer Transform data ******************* */ /* This function applies the rules for transforming a strip so duplicate - * checks dont need to be added in multiple places. + * checks don't need to be added in multiple places. * * recursive, count and flag MUST be set. * @@ -3918,7 +3918,7 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count /* Recursive */ if ((seq->type == SEQ_META) && ((seq->flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL)) == 0)) { - /* if any handles are selected, dont recurse */ + /* if any handles are selected, don't recurse */ *recursive = 1; } else { @@ -3936,8 +3936,8 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count #else if (seq->type == SEQ_META) { /* Meta's can only directly be moved between channels since they - * dont have their start and length set directly (children affect that) - * since this Meta is nested we dont need any of its data infact. + * don't have their start and length set directly (children affect that) + * since this Meta is nested we don't need any of its data infact. * calc_sequence() will update its settings when run on the toplevel meta */ *flag= 0; *count= 0; @@ -4732,7 +4732,7 @@ void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *o float cfra= (float)CFRA; short flag= 0; - /* flag is initialised from UserPref keyframing settings + /* flag is initialized from UserPref keyframing settings * - special exception for targetless IK - INSERTKEY_MATRIX keyframes should get * visual keyframes even if flag not set, as it's not that useful otherwise * (for quick animation recording) @@ -5255,7 +5255,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t) /* recalculating the frame positions means we loose our original transform if its not auto-keyed [#24451] * this hack re-applies it, which is annoying, only alternatives are... - * - dont recalc paths. + * - don't recalc paths. * - have an object_handle_update() which gives is the new transform without touching the objects. * - only recalc paths on auto-keying. * - ED_objects_recalculate_paths could backup/restore transforms. @@ -5991,7 +5991,7 @@ void createTransData(bContext *C, TransInfo *t) * transform ops redo clears sculpt/project undo stack. * * Could use 'OB_MODE_ALL_PAINT' since there are key conflicts, - * transform + paint isnt well supported. */ + * transform + paint isn't well supported. */ } else { createTransObject(C, t); diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index c2568100ac2..501aa93cfa6 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -1044,7 +1044,7 @@ static int select_edgeloop(Scene *scene, Image *ima, BMEditMesh *em, NearestHit starttotf= 0; uv_edge_tag_faces(em, iterv1, iterv2, &starttotf); - /* sorry, first edge isnt even ok */ + /* sorry, first edge isn't even ok */ if(iterv1->flag==0 && iterv2->flag==0) looking= 0; else looking= 1; @@ -1462,7 +1462,7 @@ static void weld_align_uv(bContext *C, int tool) /* walk over edges, building an array of verts in a line */ while (eve) { BLI_array_append(eve_line, eve); - /* dont touch again */ + /* don't touch again */ BM_elem_flag_disable(eve, BM_ELEM_TAG); eve_next = NULL; @@ -1737,7 +1737,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop) NearestHit hit; int i, select = 1, selectmode, sticky, sync, *hitv=NULL, nvert; BLI_array_declare(hitv); - int flush = 0, hitlen=0; /* 0 == dont flush, 1 == sel, -1 == desel; only use when selection sync is enabled */ + int flush = 0, hitlen=0; /* 0 == don't flush, 1 == sel, -1 == desel; only use when selection sync is enabled */ float limit[2], **hituv = NULL; BLI_array_declare(hituv); float penalty[2]; diff --git a/source/blender/imbuf/IMB_thumbs.h b/source/blender/imbuf/IMB_thumbs.h index 49e90134d21..76c09ec1486 100644 --- a/source/blender/imbuf/IMB_thumbs.h +++ b/source/blender/imbuf/IMB_thumbs.h @@ -57,7 +57,7 @@ typedef enum ThumbSource { THB_SOURCE_BLEND } ThumbSource; -/* dont generate thumbs for images bigger then this (100mb) */ +/* don't generate thumbs for images bigger then this (100mb) */ #define THUMB_SIZE_MAX (100 * 1024*1024) // IB_metadata diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index bd79a6ea48b..bb92bd9cc09 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -333,7 +333,7 @@ static int imb_save_openexr_float(struct ImBuf *ibuf, const char *name, int flag rect[0]= ibuf->rect_float + channels*(height-1)*width; rect[1]= rect[0]+1; rect[2]= rect[0]+2; - rect[3]= (channels >= 4)? rect[0]+3:rect[0]; /* red as alpha, is this needed since alpha isnt written? */ + rect[3]= (channels >= 4)? rect[0]+3:rect[0]; /* red as alpha, is this needed since alpha isn't written? */ frameBuffer.insert ("R", Slice (FLOAT, (char *)rect[0], xstride, ystride)); frameBuffer.insert ("G", Slice (FLOAT, (char *)rect[1], xstride, ystride)); @@ -488,7 +488,7 @@ int IMB_exr_begin_write(void *handle, const char *filename, int width, int heigh header.insert ("BlenderMultiChannel", StringAttribute ("Blender V2.55.1 and newer")); - /* avoid crash/abort when we dont have permission to write here */ + /* avoid crash/abort when we don't have permission to write here */ try { data->ofile = new OutputFile(filename, header); } diff --git a/source/blender/imbuf/intern/rectop.c b/source/blender/imbuf/intern/rectop.c index 492d0af2ac8..888fe5713d1 100644 --- a/source/blender/imbuf/intern/rectop.c +++ b/source/blender/imbuf/intern/rectop.c @@ -92,7 +92,7 @@ static void blend_color_mul(char *cp, char *cp1, char *cp2, int fac) static void blend_color_lighten(char *cp, char *cp1, char *cp2, int fac) { - /* See if are lighter, if so mix, else dont do anything. + /* See if are lighter, if so mix, else don't do anything. * if the paint col is darker then the original, then ignore */ if (cp1[0]+cp1[1]+cp1[2] > cp2[0]+cp2[1]+cp2[2]) { cp[0]= cp1[0]; @@ -105,7 +105,7 @@ static void blend_color_lighten(char *cp, char *cp1, char *cp2, int fac) static void blend_color_darken(char *cp, char *cp1, char *cp2, int fac) { - /* See if were darker, if so mix, else dont do anything. + /* See if were darker, if so mix, else don't do anything. * if the paint col is brighter then the original, then ignore */ if (cp1[0]+cp1[1]+cp1[2] < cp2[0]+cp2[1]+cp2[2]) { cp[0]= cp1[0]; @@ -201,7 +201,7 @@ static void blend_color_mul_float(float *cp, float *cp1, float *cp2, float fac) static void blend_color_lighten_float(float *cp, float *cp1, float *cp2, float fac) { - /* See if are lighter, if so mix, else dont do anything. + /* See if are lighter, if so mix, else don't do anything. * if the pafloat col is darker then the original, then ignore */ if (cp1[0]+cp1[1]+cp1[2] > cp2[0]+cp2[1]+cp2[2]) { cp[0]= cp1[0]; @@ -214,7 +214,7 @@ static void blend_color_lighten_float(float *cp, float *cp1, float *cp2, float f static void blend_color_darken_float(float *cp, float *cp1, float *cp2, float fac) { - /* See if were darker, if so mix, else dont do anything. + /* See if were darker, if so mix, else don't do anything. * if the pafloat col is brighter then the original, then ignore */ if (cp1[0]+cp1[1]+cp1[2] < cp2[0]+cp2[1]+cp2[2]) { cp[0]= cp1[0]; diff --git a/source/blender/imbuf/intern/thumbs_blend.c b/source/blender/imbuf/intern/thumbs_blend.c index 037b4ab63c0..1068eccc6e0 100644 --- a/source/blender/imbuf/intern/thumbs_blend.c +++ b/source/blender/imbuf/intern/thumbs_blend.c @@ -41,7 +41,7 @@ #include "MEM_guardedalloc.h" /* extracts the thumbnail from between the 'REND' and the 'GLOB' - * chunks of the header, dont use typical blend loader because its too slow */ + * chunks of the header, don't use typical blend loader because its too slow */ static ImBuf *loadblend_thumb(gzFile gzfile) { diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 73aabd7d84b..f75ed756e44 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -511,7 +511,7 @@ typedef enum eAction_Flags { /* Storage for Dopesheet/Grease-Pencil Editor data */ typedef struct bDopeSheet { ID *source; /* currently ID_SCE (for Dopesheet), and ID_SC (for Grease Pencil) */ - ListBase chanbase; /* cache for channels (only initialised when pinned) */ // XXX not used! + ListBase chanbase; /* cache for channels (only initialized when pinned) */ // XXX not used! struct Group *filter_grp; /* object group for ADS_FILTER_ONLYOBGROUP filtering option */ char searchstr[64]; /* string to search for in displayed names of F-Curves for ADS_FILTER_BY_FCU_NAME filtering option */ diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index c68592e525c..fd4b86a4155 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -373,7 +373,7 @@ typedef struct ChannelDriver { * which relates the target 'variables' in some way to yield a single usable value */ char expression[256]; /* expression to compile for evaluation */ - void *expr_comp; /* PyObject - compiled expression, dont save this */ + void *expr_comp; /* PyObject - compiled expression, don't save this */ float curval; /* result of previous evaluation */ float influence; /* influence of driver on result */ // XXX to be implemented... this is like the constraint influence setting @@ -408,7 +408,7 @@ typedef enum eDriver_Flags { //DRIVER_FLAG_LAYERING = (1<<2), /* use when the expression needs to be recompiled */ DRIVER_FLAG_RECOMPILE = (1<<3), - /* the names are cached so they dont need have python unicode versions created each time */ + /* the names are cached so they don't need have python unicode versions created each time */ DRIVER_FLAG_RENAMEVAR = (1<<4), /* intermediate values of driver should be shown in the UI for debugging purposes */ DRIVER_FLAG_SHOWDEBUG = (1<<5) diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h index b8b1f7d8b70..8b254b3b044 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -113,7 +113,7 @@ typedef struct bArmature { } bArmature; /* armature->flag */ -/* dont use bit 7, was saved in files to disable stuff */ +/* don't use bit 7, was saved in files to disable stuff */ typedef enum eArmature_Flag { ARM_RESTPOS = (1<<0), ARM_DRAWXRAY = (1<<1), /* XRAY is here only for backwards converting */ diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 6f3014c0961..3de5372d848 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -132,7 +132,7 @@ typedef struct bGPdata { int flag; /* settings for this datablock */ /* not-saved stroke buffer data (only used during paint-session) - * - buffer must be initialised before use, but freed after + * - buffer must be initialized before use, but freed after * whole paint operation is over */ short sbuffer_size; /* number of elements currently in cache */ diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index dcd4306600f..2b3719a10b5 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -206,7 +206,7 @@ typedef struct Material { /* maximum number of materials per material array. * (on object, mesh, lamp, etc.). limited by * short mat_nr in verts, faces. - * -1 becayse for active material we store the index + 1 */ + * -1 because for active material we store the index + 1 */ #define MAXMAT (32767-1) /* material_type */ diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 48704fe43d4..1934ae8aa3a 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -86,7 +86,7 @@ typedef struct Mesh { struct MEdge *medge; /* array of edges */ struct MDeformVert *dvert; /* deformgroup vertices */ - /* array of colors for the tesselated faces, must be number of tesselated + /* array of colors for the tessellated faces, must be number of tessellated * faces * 4 in length */ struct MCol *mcol; struct MSticky *msticky; diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h index 0e70b5d28e3..6fefd2d672f 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force.h @@ -401,7 +401,7 @@ typedef struct SoftBody { #define PTCACHE_FRAMES_SKIPPED 256 #define PTCACHE_EXTERNAL 512 #define PTCACHE_READ_INFO 1024 -/* dont use the filename of the blendfile the data is linked from (write a local cache) */ +/* don't use the filename of the blendfile the data is linked from (write a local cache) */ #define PTCACHE_IGNORE_LIBPATH 2048 /* high resolution cache is saved for smoke for backwards compatibility, so set this flag to know it's a "fake" cache */ #define PTCACHE_FAKE_SMOKE (1<<12) diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index cff4e539e6e..aeae840707d 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -292,7 +292,7 @@ typedef struct SpeedControlVars { /* convenience define for all selection flags */ #define SEQ_ALLSEL (SELECT+SEQ_LEFTSEL+SEQ_RIGHTSEL) -/* deprecated, dont use a flag anymore*/ +/* deprecated, don't use a flag anymore*/ /*#define SEQ_ACTIVE 1048576*/ #define SEQ_COLOR_BALANCE_INVERSE_GAIN 1 diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 128c1422ed6..cd17d464fd5 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -635,7 +635,7 @@ enum FileSortTypeE { /* filesel types */ #define FILE_UNIX 8 -#define FILE_BLENDER 8 /* dont display relative paths */ +#define FILE_BLENDER 8 /* don't display relative paths */ #define FILE_SPECIAL 9 #define FILE_LOADLIB 1 @@ -693,7 +693,7 @@ enum FileSortTypeE { /* SpaceImage->sticky * Note DISABLE should be 0, however would also need to re-arrange icon order, - * also, sticky loc is the default mode so this means we dont need to 'do_versons' */ + * also, sticky loc is the default mode so this means we don't need to 'do_versons' */ #define SI_STICKY_LOC 0 #define SI_STICKY_DISABLE 1 #define SI_STICKY_VERTEX 2 diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index cdb6d8d053c..c86d9d17b1f 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -85,7 +85,7 @@ enum ReportListFlags { RPT_PRINT = 1, RPT_STORE = 2, RPT_FREE = 4, - RPT_OP_HOLD = 8 /* dont move them into the operator global list (caller will use) */ + RPT_OP_HOLD = 8 /* don't move them into the operator global list (caller will use) */ }; # # @@ -98,7 +98,7 @@ typedef struct Report { const char *message; } Report; -/* saved in the wm, dont remove */ +/* saved in the wm, don't remove */ typedef struct ReportList { ListBase list; int printlevel; /* ReportType */ @@ -159,7 +159,7 @@ typedef struct wmWindowManager { typedef struct wmWindow { struct wmWindow *next, *prev; - void *ghostwin; /* dont want to include ghost.h stuff */ + void *ghostwin; /* don't want to include ghost.h stuff */ int winid; /* winid also in screens, is for retrieving this window after read */ diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index 5482566ac41..b3c10406d4c 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -66,7 +66,7 @@ typedef struct World { /** * Exposure= mult factor. unused now, but maybe back later. Kept in to be upward compat. * New is exp/range control. linfac & logfac are constants... don't belong in - * file, but allocating 8 bytes for temp mem isnt useful either. + * file, but allocating 8 bytes for temp mem isn't useful either. */ float exposure, exp, range; float linfac, logfac; diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index bb69e23b1f3..23a1b0a83d7 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -1882,7 +1882,7 @@ static const char *rna_property_subtypename(PropertySubType type) case PROP_LAYER: return "PROP_LAYER"; case PROP_LAYER_MEMBER: return "PROP_LAYER_MEMBER"; default: { - /* in case we dont have a type preset that includes the subtype */ + /* in case we don't have a type preset that includes the subtype */ if (RNA_SUBTYPE_UNIT(type)) { return rna_property_subtypename(type & ~RNA_SUBTYPE_UNIT(type)); } diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index bb541471a19..03519bf1896 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -302,7 +302,7 @@ static void rna_ID_update_tag(ID *id, ReportList *reports, int flag) void rna_ID_user_clear(ID *id) { - id->us = 0; /* dont save */ + id->us = 0; /* don't save */ id->flag &= ~LIB_FAKEUSER; } @@ -416,7 +416,7 @@ static void rna_def_ID_properties(BlenderRNA *brna) RNA_def_struct_refine_func(srna, "rna_PropertyGroup_refine"); /* important so python types can have their name used in list views - * however this isnt prefect because it overrides how python would set the name + * however this isn't prefect because it overrides how python would set the name * when we only really want this so RNA_def_struct_name_property() is set to something useful */ prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); RNA_def_property_flag(prop, PROP_EXPORT|PROP_IDPROPERTY); diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 76d33ea9b9a..8e2319215a8 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -1405,7 +1405,7 @@ int RNA_property_animated(PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop)) /* this function is to check if its possible to create a valid path from the ID - * its slow so dont call in a loop */ + * its slow so don't call in a loop */ int RNA_property_path_from_ID_check(PointerRNA *ptr, PropertyRNA *prop) { char *path = RNA_path_from_ID_to_property(ptr, prop); @@ -1466,7 +1466,7 @@ static void rna_property_update(bContext *C, Main *bmain, Scene *scene, PointerR /* must keep in sync with 'rna_property_update' * note, its possible this returns a false positive in the case of PROP_CONTEXT_UPDATE - * but this isnt likely to be a performance problem. */ + * but this isn't likely to be a performance problem. */ int RNA_property_update_check(PropertyRNA *prop) { return (prop->magic != RNA_MAGIC || prop->update || prop->noteflag); @@ -4567,7 +4567,7 @@ char *RNA_property_as_string(bContext *C, PointerRNA *ptr, PropertyRNA *prop) } case PROP_ENUM: { - /* string arrays dont exist */ + /* string arrays don't exist */ const char *identifier; int val = RNA_property_enum_get(ptr, prop); diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 1afd5d816d1..127234636d2 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -118,7 +118,7 @@ Scene *rna_Main_scenes_new(Main *UNUSED(bmain), const char *name) } void rna_Main_scenes_remove(Main *bmain, bContext *C, ReportList *reports, struct Scene *scene) { - /* dont call free_libblock(...) directly */ + /* don't call free_libblock(...) directly */ Scene *newscene; if (scene->id.prev) diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index f7dee561250..a2542968294 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1538,7 +1538,7 @@ static void rna_def_mpolygon(BlenderRNA *brna) RNA_def_struct_path_func(srna, "rna_MeshPolygon_path"); RNA_def_struct_ui_icon(srna, ICON_FACESEL); - /* Faked, actually access to loop vertex values, dont this way because manually setting up + /* Faked, actually access to loop vertex values, don't this way because manually setting up * vertex/edge per loop is very low level. * Instead we setup poly sizes, assign indices, then calc edges automatic when creating * meshes from rna/py. */ diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index a6ab9051528..2cb893290fa 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -1433,7 +1433,7 @@ static void rna_def_modifier_array(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Relative Offset", "Add an offset relative to the object's bounding box"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop = RNA_def_property(srna, "relative_offset_displace", PROP_FLOAT, PROP_NONE); /* PROP_TRANSLATION causes units to be used which we dont want */ + prop = RNA_def_property(srna, "relative_offset_displace", PROP_FLOAT, PROP_NONE); /* PROP_TRANSLATION causes units to be used which we don't want */ RNA_def_property_float_sdna(prop, NULL, "scale"); RNA_def_property_ui_text(prop, "Relative Offset Displacement", "The size of the geometry will determine the distance between arrayed items"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 088d4870143..94106878cf9 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -161,7 +161,7 @@ static void rna_Object_internal_update(Main *UNUSED(bmain), Scene *UNUSED(scene) static void rna_Object_matrix_world_update(Main *bmain, Scene *scene, PointerRNA *ptr) { - /* dont use compat so we get predictable rotation */ + /* don't use compat so we get predictable rotation */ object_apply_mat4(ptr->id.data, ((Object *)ptr->id.data)->obmat, FALSE, TRUE); rna_Object_internal_update(bmain, scene, ptr); } @@ -196,7 +196,7 @@ static void rna_Object_matrix_local_set(PointerRNA *ptr, const float values[16]) copy_m4_m4(ob->obmat, (float(*)[4])values); } - /* dont use compat so we get predictable rotation */ + /* don't use compat so we get predictable rotation */ object_apply_mat4(ob, ob->obmat, FALSE, FALSE); } diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index a4ed256b70c..16328b7e6e1 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -2734,7 +2734,7 @@ static void rna_def_particle_system(BlenderRNA *brna) /* vertex groups */ /* note, internally store as ints, access as strings */ -#if 0 /* int access. works ok but isnt useful for the UI */ +#if 0 /* int access. works ok but isn't useful for the UI */ prop = RNA_def_property(srna, "vertex_group_density", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "vgroup[0]"); RNA_def_property_ui_text(prop, "Vertex Group Density", "Vertex group to control density"); diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index e1abcb052be..6aa484b8e5c 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -125,7 +125,7 @@ static void rna_BoneGroup_color_set_set(PointerRNA *ptr, int value) memcpy(&grp->cs, col_set, sizeof(ThemeWireColor)); } else { - /* init custom colors with a generic multi-color rgb set, if not initialised already (for custom color set) */ + /* init custom colors with a generic multi-color rgb set, if not initialized already (for custom color set) */ if (grp->cs.solid[0] == 0) { /* define for setting colors in theme below */ #define SETCOL(col, r, g, b, a) col[0] = r; col[1] = g; col[2] = b; col[3] = a; diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index 03a1fbc4a80..59a48cc1078 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -521,7 +521,7 @@ static int rna_Property_readonly_get(PointerRNA *ptr) { PropertyRNA *prop = (PropertyRNA*)ptr->data; - /* dont use this becaure it will call functions that check the internal + /* don't use this becaure it will call functions that check the internal * data for introspection we only need to know if it can be edited so the * flag is better for this */ /* return RNA_property_editable(ptr, prop); */ diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 0553cd6dd65..0371cf6e8dc 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -328,7 +328,7 @@ static Base *rna_Scene_object_link(Scene *scene, bContext *C, ReportList *report /* this is similar to what object_add_type and add_object do */ base->lay = scene->lay; - /* when linking to an inactive scene dont touch the layer */ + /* when linking to an inactive scene don't touch the layer */ if (scene == scene_act) ob->lay = base->lay; diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index d414658f32d..fd94212101b 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -84,7 +84,7 @@ static void rna_SequenceEditor_sequences_all_next(CollectionPropertyIterator *it internal->link = NULL; do { - seq = seq->tmp; /* XXX - seq's dont reference their parents! */ + seq = seq->tmp; /* XXX - seq's don't reference their parents! */ if (seq && seq->next) { internal->link = (Link*)seq->next; break; @@ -371,7 +371,7 @@ static void rna_Sequence_name_set(PointerRNA *ptr, const char *value) /* fix all the animation data which may link to this */ - /* dont rename everywhere because these are per scene */ + /* don't rename everywhere because these are per scene */ /* BKE_all_animdata_fix_paths_rename("sequence_editor.sequences_all", oldname, seq->name+2); */ adt = BKE_animdata_from_id(&scene->id); if (adt) diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index a3a447b0478..4df0f6c8b9c 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1238,7 +1238,7 @@ static void rna_def_background_image(BlenderRNA *brna) StructRNA *srna; PropertyRNA *prop; - /* note: combinations work but dont flip so arnt that useful */ + /* note: combinations work but don't flip so arnt that useful */ static EnumPropertyItem bgpic_axis_items[] = { {0, "", 0, "X Axis", ""}, {(1<<RV3D_VIEW_LEFT), "LEFT", 0, "Left", "Show background image while looking to the left"}, diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 65c655b5ee7..b0fdad95a7a 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -2976,7 +2976,7 @@ static void rna_def_userdef_system(BlenderRNA *brna) prop = RNA_def_property(srna, "use_vertex_buffer_objects", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "gameflags", USER_DISABLE_VBO); RNA_def_property_ui_text(prop, "VBOs", "Use Vertex Buffer Objects (or Vertex Arrays, if unsupported) for viewport rendering"); - RNA_def_property_update(prop, NC_WINDOW, NULL); /* this isnt essential but nice to check if VBO draws any differently */ + RNA_def_property_update(prop, NC_WINDOW, NULL); /* this isn't essential but nice to check if VBO draws any differently */ prop = RNA_def_property(srna, "use_antialiasing", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "gameflags", USER_DISABLE_AA); diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 18d599ca283..8f161d78145 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -498,7 +498,7 @@ static int rna_Event_ascii_length(PointerRNA *ptr) static void rna_Event_unicode_get(PointerRNA *ptr, char *value) { - /* utf8 buf isnt \0 terminated */ + /* utf8 buf isn't \0 terminated */ wmEvent *event = (wmEvent*)ptr->data; size_t len = 0; @@ -517,7 +517,7 @@ static int rna_Event_unicode_length(PointerRNA *ptr) wmEvent *event = (wmEvent*)ptr->data; if (event->utf8_buf[0]) { - return BLI_str_utf8_size(event->utf8_buf); /* invalid value is checked on assignment so we dont need to account for this */ + return BLI_str_utf8_size(event->utf8_buf); /* invalid value is checked on assignment so we don't need to account for this */ } else { return 0; diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c index bfe0f1cba65..78d69926748 100644 --- a/source/blender/makesrna/intern/rna_wm_api.c +++ b/source/blender/makesrna/intern/rna_wm_api.c @@ -59,7 +59,7 @@ static void rna_Operator_report(wmOperator *op, int type, const char *msg) BKE_report(op->reports, type, msg); } -/* since event isnt needed... */ +/* since event isn't needed... */ static void rna_Operator_enum_search_invoke(bContext *C, wmOperator *op) { WM_enum_search_invoke(C, op, NULL); diff --git a/source/blender/makesrna/intern/rna_world.c b/source/blender/makesrna/intern/rna_world.c index 4c641062954..bfa7d703860 100644 --- a/source/blender/makesrna/intern/rna_world.c +++ b/source/blender/makesrna/intern/rna_world.c @@ -449,7 +449,7 @@ static void rna_def_world_stars(BlenderRNA *brna) RNA_def_property_float_sdna(prop, NULL, "starsize"); RNA_def_property_range(prop, 0, 10); RNA_def_property_ui_text(prop, "Size", "Average screen dimension of stars"); - RNA_def_property_update(prop, 0, "rna_World_draw_update"); /* use normal update since this isnt visualized */ + RNA_def_property_update(prop, 0, "rna_World_draw_update"); /* use normal update since this isn't visualized */ prop = RNA_def_property(srna, "distance_min", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "starmindist"); diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 05fcb04d7ea..3949938321a 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -349,7 +349,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, BMO_op_finish(em->bm, &findop); } - /* generate merge mappping using index map. we do this by using the + /* generate merge mapping using index map. we do this by using the * operator slots as lookup arrays.*/ #define E(i) (i) < s1->len ? _E(s1, i) : _E(s2, (i)-s1->len) @@ -377,7 +377,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, if ((start_cap || end_cap) && /* BMESH_TODO - theres a bug in DM_to_bmesh_ex() when in editmode! - * this needs investigation, but for now at least dont crash */ + * this needs investigation, but for now at least don't crash */ ob->mode != OB_MODE_EDIT ) diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 9f15060033d..3bf30e5fa14 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -135,7 +135,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, /* when one of objects is empty (has got no faces) we could speed up * calculation a bit returning one of objects' derived meshes (or empty one) - * Returning mesh is depended on modifieier's operation (sergey) */ + * Returning mesh is depended on modifiers operation (sergey) */ result = get_quick_derivedMesh(derivedData, dm, bmd->operation); if(result == NULL) { diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 51e65e2387a..29b37acaeaf 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -162,7 +162,7 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd, } /* copy customdata to new geometry, - * copy from its self becayse this data may have been created in the checks above */ + * copy from its self because this data may have been created in the checks above */ DM_copy_vert_data(result, result, 0, maxVerts, maxVerts); DM_copy_edge_data(result, result, 0, maxEdges, maxEdges); /* loops are copied later */ diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index f88c49fc6d7..52574e89d89 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -175,7 +175,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, ScrewVertConnect *vc, *vc_tmp, *vert_connect= NULL; - /* dont do anything? */ + /* don't do anything? */ if (!totvert) return CDDM_from_template(dm, 0, 0, 0, 0, 0); @@ -388,7 +388,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, vc->v[0]= vc->v[1]= -1; mul_m4_v3(mtx_tx, vc->co); - /* length in 2d, dont sqrt because this is only for comparison */ + /* length in 2d, don't sqrt because this is only for comparison */ vc->dist = vc->co[other_axis_1]*vc->co[other_axis_1] + vc->co[other_axis_2]*vc->co[other_axis_2]; @@ -405,7 +405,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, vc->e[0]= vc->e[1]= NULL; vc->v[0]= vc->v[1]= -1; - /* length in 2d, dont sqrt because this is only for comparison */ + /* length in 2d, don't sqrt because this is only for comparison */ vc->dist = vc->co[other_axis_1]*vc->co[other_axis_1] + vc->co[other_axis_2]*vc->co[other_axis_2]; @@ -426,7 +426,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, vc->e[1]= med_new; } else { - vc->v[0]= vc->v[1]= -2; /* erro value - dont use, 3 edges on vert */ + vc->v[0]= vc->v[1]= -2; /* erro value - don't use, 3 edges on vert */ } vc= &vert_connect[med_new->v2]; @@ -441,7 +441,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, vc->e[1]= med_new; } else { - vc->v[0]= vc->v[1]= -2; /* erro value - dont use, 3 edges on vert */ + vc->v[0]= vc->v[1]= -2; /* erro value - don't use, 3 edges on vert */ } } @@ -639,7 +639,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, } else { /* only 1 edge connected - same as above except - * dont need to average edge direction */ + * don't need to average edge direction */ if (vc->e && vc->e[0]->v2 == i) { sub_v3_v3v3(tmp_vec1, mvert_new[i].co, mvert_new[vc->v[0]].co); } diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index b7c820991f1..cca4cda7e20 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -400,7 +400,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, ed->v2 += numVerts; } - /* note, copied vertex layers dont have flipped normals yet. do this after applying offset */ + /* note, copied vertex layers don't have flipped normals yet. do this after applying offset */ if((smd->flag & MOD_SOLIDIFY_EVEN) == 0) { /* no even thickness, very simple */ float scalar_short; diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.c b/source/blender/modifiers/intern/MOD_weightvg_util.c index 3bc6c318d9f..95e752c35df 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.c +++ b/source/blender/modifiers/intern/MOD_weightvg_util.c @@ -109,7 +109,7 @@ void weightvg_do_map(int num, float *new_w, short falloff_type, CurveMapping *cm * Return values are in org_w. * If indices is not NULL, it must be a table of same length as org_w and new_w, mapping to the real * vertex index (in case the weight tables do not cover the whole vertices...). - * XXX The standard “factor” value is assumed in [0.0, 1.0] range. Else, weird results might appear. + * XXX The standard "factor" value is assumed in [0.0, 1.0] range. Else, weird results might appear. */ void weightvg_do_mask(int num, const int *indices, float *org_w, const float *new_w, Object *ob, DerivedMesh *dm, float fact, const char defgrp_name[MAX_VGROUP_NAME], diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.h b/source/blender/modifiers/intern/MOD_weightvg_util.h index a723d0f02e5..57ba115c04e 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.h +++ b/source/blender/modifiers/intern/MOD_weightvg_util.h @@ -70,7 +70,7 @@ void weightvg_do_map(int num, float *new_w, short mode, struct CurveMapping *cma * Return values are in org_w. * If indices is not NULL, it must be a table of same length as org_w and new_w, mapping to the real * vertex index (in case the weight tables do not cover the whole vertices...). - * XXX The standard “factor” value is assumed in [0.0, 1.0] range. Else, weird results might appear. + * XXX The standard "factor" value is assumed in [0.0, 1.0] range. Else, weird results might appear. */ void weightvg_do_mask(int num, const int *indices, float *org_w, const float *new_w, Object *ob, DerivedMesh *dm, float fact, const char defgrp_name[MAX_VGROUP_NAME], Tex *texture, diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index ec9b2b80d83..4babe615a19 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -183,7 +183,7 @@ static float get_ob2ob_distance(const Object* ob, const Object* obr) } /** - * Maps distances to weights, with an optionnal “smoothing” mapping. + * Maps distances to weights, with an optionnal "smoothing" mapping. */ void do_map(float *weights, const int nidx, const float min_d, const float max_d, short mode) { diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.c b/source/blender/nodes/composite/nodes/node_composite_colorbalance.c index 26d7aa0a3a0..9995036f89c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_colorbalance.c +++ b/source/blender/nodes/composite/nodes/node_composite_colorbalance.c @@ -69,7 +69,7 @@ DO_INLINE float colorbalance_cdl(float in, float offset, float power, float slop /* note: lift_lgg is just 2-lift, gamma_inv is 1.0/gamma */ DO_INLINE float colorbalance_lgg(float in, float lift_lgg, float gamma_inv, float gain) { - /* 1:1 match with the sequencer with linear/srgb conversions, the conversion isnt pretty + /* 1:1 match with the sequencer with linear/srgb conversions, the conversion isn'tisn't pretty * but best keep it this way, sice testing for durian shows a similar calculation * without lin/srgb conversions gives bad results (over-saturated shadows) with colors * slightly below 1.0. some correction can be done but it ends up looking bad for shadows or lighter tones - campbell */ diff --git a/source/blender/nodes/shader/node_shader_util.c b/source/blender/nodes/shader/node_shader_util.c index 6e79c4acbeb..606ba98762c 100644 --- a/source/blender/nodes/shader/node_shader_util.c +++ b/source/blender/nodes/shader/node_shader_util.c @@ -132,7 +132,7 @@ void nodeShaderSynchronizeID(bNode *node, int copyto) Material *ma= (Material *)node->id; int a; - /* hrmf, case in loop isnt super fast, but we dont edit 100s of material at same time either! */ + /* hrmf, case in loop isn't super fast, but we don't edit 100s of material at same time either! */ for(a=0, sock= node->inputs.first; sock; sock= sock->next, a++) { if(!nodeSocketIsHidden(sock)) { if(copyto) { diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index c8e4c818262..1c4b52d4f42 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -1973,7 +1973,7 @@ static PyObject *bpy_bmelemseq_index_update(BPy_BMElemSeq *self) } if (htype & (BM_VERT | BM_EDGE | BM_FACE)) { - /* since this isnt the normal vert/edge/face loops, + /* since this isn't the normal vert/edge/face loops, * we're setting dirty values here. so tag as dirty. */ bm->elem_index_dirty |= htype; } @@ -2248,7 +2248,7 @@ static PyObject *bpy_bmelemseq_subscript_slice(BPy_BMElemSeq *self, Py_ssize_t s static PyObject *bpy_bmelemseq_subscript(BPy_BMElemSeq *self, PyObject *key) { - /* dont need error check here */ + /* don't need error check here */ if (PyIndex_Check(key)) { Py_ssize_t i = PyNumber_AsSsize_t(key, PyExc_IndexError); if (i == -1 && PyErr_Occurred()) @@ -3104,7 +3104,7 @@ void *BPy_BMElem_PySeq_As_Array(BMesh **r_bm, PyObject *seq, Py_ssize_t min, Py_ ok = FALSE; } - /* ensure we dont leave this enabled */ + /* ensure we don't leave this enabled */ BM_elem_flag_disable(alloc[i], BM_ELEM_INTERNAL_TAG); } diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.c b/source/blender/python/bmesh/bmesh_py_types_customdata.c index c7b271248de..530a9f2ae97 100644 --- a/source/blender/python/bmesh/bmesh_py_types_customdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_customdata.c @@ -413,7 +413,7 @@ static PyObject *bpy_bmlayercollection_subscript_slice(BPy_BMLayerCollection *se static PyObject *bpy_bmlayercollection_subscript(BPy_BMLayerCollection *self, PyObject *key) { - /* dont need error check here */ + /* don't need error check here */ if (PyUnicode_Check(key)) { return bpy_bmlayercollection_subscript_str(self, _PyUnicode_AsString(key)); } diff --git a/source/blender/python/bmesh/bmesh_py_types_select.c b/source/blender/python/bmesh/bmesh_py_types_select.c index 4bd8ce70fbc..af1ebee7fc6 100644 --- a/source/blender/python/bmesh/bmesh_py_types_select.c +++ b/source/blender/python/bmesh/bmesh_py_types_select.c @@ -247,7 +247,7 @@ static PyObject *bpy_bmeditselseq_subscript_slice(BPy_BMEditSelSeq *self, Py_ssi static PyObject *bpy_bmeditselseq_subscript(BPy_BMEditSelSeq *self, PyObject *key) { - /* dont need error check here */ + /* don't need error check here */ if (PyIndex_Check(key)) { Py_ssize_t i = PyNumber_AsSsize_t(key, PyExc_IndexError); if (i == -1 && PyErr_Occurred()) diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c index 0b89b8744b9..fdb5f629115 100644 --- a/source/blender/python/generic/py_capi_utils.c +++ b/source/blender/python/generic/py_capi_utils.c @@ -329,7 +329,7 @@ PyObject *PyC_ExceptionBuffer(void) goto error_cleanup; } - Py_INCREF(stdout_backup); // since these were borrowed we dont want them freed when replaced. + Py_INCREF(stdout_backup); // since these were borrowed we don't want them freed when replaced. Py_INCREF(stderr_backup); PySys_SetObject("stdout", string_io); // both of these are freed when restoring @@ -449,7 +449,7 @@ void PyC_MainModule_Backup(PyObject **main_mod) { PyInterpreterState *interp = PyThreadState_GET()->interp; *main_mod = PyDict_GetItemString(interp->modules, "__main__"); - Py_XINCREF(*main_mod); /* dont free */ + Py_XINCREF(*main_mod); /* don't free */ } void PyC_MainModule_Restore(PyObject *main_mod) @@ -517,7 +517,7 @@ void PyC_RunQuicky(const char *filepath, int n, ...) int i; PyObject *py_dict = PyC_DefaultNameSpace(filepath); - PyObject *values = PyList_New(n / 2); /* namespace owns this, dont free */ + PyObject *values = PyList_New(n / 2); /* namespace owns this, don't free */ PyObject *py_result, *ret; @@ -580,7 +580,7 @@ void PyC_RunQuicky(const char *filepath, int n, ...) if (values && PyList_Check(values)) { - /* dont use the result */ + /* don't use the result */ Py_DECREF(py_result); py_result = NULL; diff --git a/source/blender/python/intern/bpy_driver.c b/source/blender/python/intern/bpy_driver.c index 95b00b18f43..e2acef7bb73 100644 --- a/source/blender/python/intern/bpy_driver.c +++ b/source/blender/python/intern/bpy_driver.c @@ -70,7 +70,7 @@ int bpy_pydriver_create_dict(void) mod = PyImport_ImportModule("math"); if (mod) { - PyDict_Merge(d, PyModule_GetDict(mod), 0); /* 0 - dont overwrite existing values */ + PyDict_Merge(d, PyModule_GetDict(mod), 0); /* 0 - don't overwrite existing values */ Py_DECREF(mod); } @@ -159,14 +159,14 @@ static void pydriver_error(ChannelDriver *driver) /* This evals py driver expressions, 'expr' is a Python expression that * should evaluate to a float number, which is returned. * - * (old)note: PyGILState_Ensure() isnt always called because python can call + * (old)note: PyGILState_Ensure() isn't always called because python can call * the bake operator which intern starts a thread which calls scene update * which does a driver update. to avoid a deadlock check PYC_INTERPRETER_ACTIVE * if PyGILState_Ensure() is needed - see [#27683] * * (new)note: checking if python is running is not threadsafe [#28114] * now release the GIL on python operator execution instead, using - * PyEval_SaveThread() / PyEval_RestoreThread() so we dont lock up blender. + * PyEval_SaveThread() / PyEval_RestoreThread() so we don't lock up blender. */ float BPY_driver_exec(ChannelDriver *driver, const float evaltime) { diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 7e04f890303..52272bdb697 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -96,7 +96,7 @@ void bpy_context_update(bContext *C) { BPy_SetContext(C); bpy_import_main_set(CTX_data_main(C)); - BPY_modules_update(C); /* can give really bad results if this isnt here */ + BPY_modules_update(C); /* can give really bad results if this isn't here */ } void bpy_context_set(bContext *C, PyGILState_STATE *gilstate) @@ -497,7 +497,7 @@ int BPY_button_exec(bContext *C, const char *expr, double *value, const short ve mod = PyImport_ImportModule("math"); if (mod) { - PyDict_Merge(py_dict, PyModule_GetDict(mod), 0); /* 0 - dont overwrite existing values */ + PyDict_Merge(py_dict, PyModule_GetDict(mod), 0); /* 0 - don't overwrite existing values */ Py_DECREF(mod); } else { /* highly unlikely but possibly */ @@ -705,7 +705,7 @@ int BPY_context_member_get(bContext *C, const char *member, bContextDataResult * #ifdef WITH_PYTHON_MODULE #include "BLI_fileops.h" -/* TODO, reloading the module isnt functional at the moment. */ +/* TODO, reloading the module isn't functional at the moment. */ static void bpy_module_free(void *mod); extern int main_python_enter(int argc, const char **argv); @@ -782,7 +782,7 @@ PyInit_bpy(void) * we may end up having to rename this module so there is no naming conflict here eg: * 'from blender import bpy' * - * 3) we dont know the filename at this point, workaround by assigning a dummy value + * 3) we don't know the filename at this point, workaround by assigning a dummy value * which calls back when its freed so the real loading can take place. */ diff --git a/source/blender/python/intern/bpy_interface_atexit.c b/source/blender/python/intern/bpy_interface_atexit.c index 536cb7785e4..db97d361c73 100644 --- a/source/blender/python/intern/bpy_interface_atexit.c +++ b/source/blender/python/intern/bpy_interface_atexit.c @@ -62,7 +62,7 @@ static void atexit_func_call(const char *func_name, PyObject *atexit_func_arg) PyObject *ret; PyTuple_SET_ITEM(args, 0, atexit_func_arg); - Py_INCREF(atexit_func_arg); /* only incref so we dont dec'ref along with 'args' */ + Py_INCREF(atexit_func_arg); /* only incref so we don't dec'ref along with 'args' */ ret = PyObject_CallObject(atexit_func, args); diff --git a/source/blender/python/intern/bpy_library.c b/source/blender/python/intern/bpy_library.c index ee50fde35d6..9148ccde9a0 100644 --- a/source/blender/python/intern/bpy_library.c +++ b/source/blender/python/intern/bpy_library.c @@ -431,7 +431,7 @@ int bpy_lib_init(PyObject *mod_par) PyModule_AddObject(mod_par, "_library_load", PyCFunction_New(&load_meth, NULL)); - /* some compilers dont like accessing this directly, delay assignment */ + /* some compilers don't like accessing this directly, delay assignment */ bpy_lib_Type.tp_getattro = PyObject_GenericGetAttr; if (PyType_Ready(&bpy_lib_Type) < 0) diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c index 140e2f3ad7c..14058c96633 100644 --- a/source/blender/python/intern/bpy_operator.c +++ b/source/blender/python/intern/bpy_operator.c @@ -225,7 +225,7 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args) ReportList *reports; reports = MEM_mallocN(sizeof(ReportList), "wmOperatorReportList"); - BKE_reports_init(reports, RPT_STORE | RPT_OP_HOLD); /* own so these dont move into global reports */ + BKE_reports_init(reports, RPT_STORE | RPT_OP_HOLD); /* own so these don't move into global reports */ #ifdef BPY_RELEASE_GIL /* release GIL, since a thread could be started from an operator diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index 7beb78e8519..ae818eb2491 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -372,7 +372,7 @@ static int bpy_struct_id_used(StructRNA *srna, char *identifier) /* Function that sets RNA, NOTE - self is NULL when called from python, * but being abused from C so we can pass the srna along. - * This isnt incorrect since its a python object - but be careful */ + * This isn't incorrect since its a python object - but be careful */ PyDoc_STRVAR(BPy_BoolProperty_doc, ".. function:: BoolProperty(name=\"\", " "description=\"\", " @@ -1039,7 +1039,7 @@ static EnumPropertyItem *enum_items_from_py(PyObject *seq_fast, PyObject *def, i (tmp.identifier = _PyUnicode_AsStringAndSize(PyTuple_GET_ITEM(item, 0), &id_str_size)) && (tmp.name = _PyUnicode_AsStringAndSize(PyTuple_GET_ITEM(item, 1), &name_str_size)) && (tmp.description = _PyUnicode_AsStringAndSize(PyTuple_GET_ITEM(item, 2), &desc_str_size)) && - /* TODO, number isnt ensured to be unique from the script author */ + /* TODO, number isn't ensured to be unique from the script author */ (item_size < 4 || py_long_as_int(PyTuple_GET_ITEM(item, 3), &tmp.value) != -1)) { if (is_enum_flag) { @@ -1260,7 +1260,7 @@ static PyObject *BPy_EnumProperty(PyObject *self, PyObject *args, PyObject *kw) } /* items can be a list or a callable */ - if (PyFunction_Check(items)) { /* dont use PyCallable_Check because we need the function code for errors */ + if (PyFunction_Check(items)) { /* don't use PyCallable_Check because we need the function code for errors */ PyCodeObject *f_code = (PyCodeObject *)PyFunction_GET_CODE(items); if (f_code->co_argcount != 2) { PyErr_Format(PyExc_ValueError, diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index cf3cd64c463..a07d3f0abaf 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -4175,7 +4175,7 @@ static void foreach_attr_type(BPy_PropertyRNA *self, const char *attr, *attr_tot = 0; *attr_signed = FALSE; - /* note: this is fail with zero length lists, so dont let this get caled in that case */ + /* note: this is fail with zero length lists, so don't let this get caled in that case */ RNA_PROP_BEGIN(&self->ptr, itemptr, self->prop) { prop = RNA_struct_find_property(&itemptr, attr); *raw_type = RNA_property_raw_type(prop); @@ -4236,7 +4236,7 @@ static int foreach_parse_args( #endif } - /* check 'attr_tot' otherwise we dont know if any values were set + /* check 'attr_tot' otherwise we don't know if any values were set * this isn't ideal because it means running on an empty list may fail silently when its not compatible. */ if (*size == 0 && *attr_tot != 0) { PyErr_SetString(PyExc_AttributeError, "attribute does not support foreach method"); @@ -4993,7 +4993,7 @@ static PyObject *pyrna_func_call(BPy_FunctionRNA *self, PyObject *args, PyObject /* Check if we gave args that don't exist in the function * printing the error is slow but it should only happen when developing. * the if below is quick, checking if it passed less keyword args then we gave. - * (Dont overwrite the error if we have one, otherwise can skip important messages and confuse with args) + * (Don't overwrite the error if we have one, otherwise can skip important messages and confuse with args) */ if (err == 0 && kw && (pykw_len > kw_tot)) { PyObject *key, *value; @@ -6606,7 +6606,7 @@ static int pyrna_deferred_register_class_recursive(StructRNA *srna, PyTypeObject int pyrna_deferred_register_class(StructRNA *srna, PyObject *py_class) { - /* Panels and Menus dont need this + /* Panels and Menus don't need this * save some time and skip the checks here */ if (!RNA_struct_idprops_register_check(srna)) return 0; @@ -6704,7 +6704,7 @@ static int bpy_class_validate(PointerRNA *dummyptr, void *py_data, int *have_fun func_arg_count = rna_function_arg_count(func); - if (func_arg_count >= 0) { /* -1 if we dont care*/ + if (func_arg_count >= 0) { /* -1 if we don't care*/ arg_count = ((PyCodeObject *)PyFunction_GET_CODE(item))->co_argcount; /* note, the number of args we check for and the number of args we give to diff --git a/source/blender/python/intern/bpy_rna_callback.c b/source/blender/python/intern/bpy_rna_callback.c index 7704ab2a417..13532b24e55 100644 --- a/source/blender/python/intern/bpy_rna_callback.c +++ b/source/blender/python/intern/bpy_rna_callback.c @@ -137,7 +137,7 @@ PyObject *pyrna_callback_remove(BPy_StructRNA *self, PyObject *args) ED_region_draw_cb_exit(((ARegion *)self->ptr.data)->type, handle); } - /* dont allow reuse */ + /* don't allow reuse */ PyCapsule_SetName(py_handle, RNA_CAPSULE_ID_INVALID); Py_RETURN_NONE; diff --git a/source/blender/python/mathutils/mathutils_Color.c b/source/blender/python/mathutils/mathutils_Color.c index 99ac53fafcf..21fbac2d570 100644 --- a/source/blender/python/mathutils/mathutils_Color.c +++ b/source/blender/python/mathutils/mathutils_Color.c @@ -504,7 +504,7 @@ static PyObject *Color_mul(PyObject *v1, PyObject *v2) /* make sure v1 is always the vector */ if (color1 && color2) { - /* col * col, dont support yet! */ + /* col * col, don't support yet! */ } else if (color1) { if (((scalar = PyFloat_AsDouble(v2)) == -1.0f && PyErr_Occurred()) == 0) { /* COLOR * FLOAT */ diff --git a/source/blender/python/mathutils/mathutils_geometry.c b/source/blender/python/mathutils/mathutils_geometry.c index d8e6744f92b..4715324751f 100644 --- a/source/blender/python/mathutils/mathutils_geometry.c +++ b/source/blender/python/mathutils/mathutils_geometry.c @@ -1063,7 +1063,7 @@ static PyObject *M_Geometry_tesselate_polygon(PyObject *UNUSED(self), PyObject * } len_polypoints = PySequence_Size(polyLine); - if (len_polypoints > 0) { /* dont bother adding edges as polylines */ + if (len_polypoints > 0) { /* don't bother adding edges as polylines */ #if 0 if (EXPP_check_sequence_consistency(polyLine, &vector_Type) != 1) { freedisplist(&dispbase); @@ -1141,7 +1141,7 @@ static PyObject *M_Geometry_tesselate_polygon(PyObject *UNUSED(self), PyObject * freedisplist(&dispbase); } else { - /* no points, do this so scripts dont barf */ + /* no points, do this so scripts don't barf */ freedisplist(&dispbase); /* possible some dl was allocated */ tri_list = PyList_New(0); } diff --git a/source/blender/quicktime/apple/qtkit_export.m b/source/blender/quicktime/apple/qtkit_export.m index db47952e45f..348613e8cd5 100644 --- a/source/blender/quicktime/apple/qtkit_export.m +++ b/source/blender/quicktime/apple/qtkit_export.m @@ -243,7 +243,7 @@ void filepath_qt(char *string, RenderData *rd) BLI_make_existing_file(string); if (!BLI_testextensie(string, ".mov")) { - /* if we dont have any #'s to insert numbers into, use 4 numbers by default */ + /* if we don't have any #'s to insert numbers into, use 4 numbers by default */ if (strchr(string, '#')==NULL) strcat(string, "####"); /* 4 numbers */ diff --git a/source/blender/quicktime/apple/qtkit_import.m b/source/blender/quicktime/apple/qtkit_import.m index 633d92e05c1..197cbdc2f0b 100644 --- a/source/blender/quicktime/apple/qtkit_import.m +++ b/source/blender/quicktime/apple/qtkit_import.m @@ -81,7 +81,7 @@ int anim_is_quicktime (const char *name) { NSAutoreleasePool *pool; - // dont let quicktime movie import handle these + // don't let quicktime movie import handle these if( BLI_testextensie(name, ".swf") || BLI_testextensie(name, ".txt") || BLI_testextensie(name, ".mpg") || @@ -396,7 +396,7 @@ int imb_is_a_quicktime (char *name) pool = [[NSAutoreleasePool alloc] init]; - // dont let quicktime image import handle these + // don't let quicktime image import handle these if( BLI_testextensie(name, ".swf") || BLI_testextensie(name, ".txt") || BLI_testextensie(name, ".mpg") || diff --git a/source/blender/quicktime/apple/quicktime_import.c b/source/blender/quicktime/apple/quicktime_import.c index a7d09682a14..5ceb80fb4b7 100644 --- a/source/blender/quicktime/apple/quicktime_import.c +++ b/source/blender/quicktime/apple/quicktime_import.c @@ -191,7 +191,7 @@ int anim_is_quicktime (const char *name) #endif OSErr err = noErr; - // dont let quicktime movie import handle these + // don't let quicktime movie import handle these if( BLI_testextensie(name, ".swf") || BLI_testextensie(name, ".txt") || BLI_testextensie(name, ".mpg") || @@ -579,7 +579,7 @@ int imb_is_a_quicktime (char *name) if(QTIME_DEBUG) printf("qt: checking as image %s\n", name); - // dont let quicktime image import handle these + // don't let quicktime image import handle these if( BLI_testextensie(name, ".swf") || BLI_testextensie(name, ".txt") || BLI_testextensie(name, ".mpg") || diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 8a9dabedb9f..7a5f6068773 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -2340,7 +2340,7 @@ static void displace_render_face(Render *re, ObjectRen *obr, VlakRen *vlr, float /* set up shadeinput struct for multitex() */ - /* memset above means we dont need this */ + /* memset above means we don't need this */ /*shi.osatex= 0;*/ /* signal not to use dx[] and dy[] texture AA vectors */ shi.obr= obr; @@ -4856,7 +4856,7 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp set_dupli_tex_mat(NULL, NULL, NULL); /* loop over all objects rather then using SETLOOPER because we may - * reference an mtex-mapped object which isnt rendered or is an + * reference an mtex-mapped object which isn't rendered or is an * empty in a dupli group. We could scan all render material/lamp/world * mtex's for mapto objects but its easier just to set the * 'imat' / 'imat_ren' on all and unlikely to be a performance hit @@ -5053,7 +5053,7 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l if(use_camera_view && camera) { /* called before but need to call again in case of lens animation from the * above call to scene_update_for_newframe, fixes bug. [#22702]. - * following calls dont depend on 'RE_SetCamera' */ + * following calls don't depend on 'RE_SetCamera' */ RE_SetCamera(re, camera); normalize_m4(camera->obmat); diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c index f9641ed9fbe..2f6934ba10f 100644 --- a/source/blender/render/intern/source/envmap.c +++ b/source/blender/render/intern/source/envmap.c @@ -504,7 +504,7 @@ void make_envmaps(Render *re) if (!(re->r.mode & R_ENVMAP)) return; - /* we dont raytrace, disabling the flag will cause ray_transp render solid */ + /* we don't raytrace, disabling the flag will cause ray_transp render solid */ trace= (re->r.mode & R_RAYTRACE); re->r.mode &= ~R_RAYTRACE; diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c index 4a6558474f0..0d509e64eaa 100644 --- a/source/blender/render/intern/source/imagetexture.c +++ b/source/blender/render/intern/source/imagetexture.c @@ -542,7 +542,7 @@ static void boxsample(ImBuf *ibuf, float minx, float miny, float maxx, float max * If variable 'imaprepeat' has been set, the * clipped-away parts are sampled as well. */ - /* note: actually minx etc isnt in the proper range... this due to filter size and offset vectors for bump */ + /* note: actually minx etc isn't in the proper range... this due to filter size and offset vectors for bump */ /* note: talpha must be initialized */ /* note: even when 'imaprepeat' is set, this can only repeate once in any direction. * the point which min/max is derived from is assumed to be wrapped */ diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 87d55795924..da4950fae24 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -370,7 +370,7 @@ Render *RE_NewRender(const char *name) } /* called for new renders and when finishing rendering so - * we calways have valid callbacks on a render */ + * we always have valid callbacks on a render */ void RE_InitRenderCB(Render *re) { /* set default empty callbacks */ @@ -1637,7 +1637,7 @@ static void do_render_seq(Render * re) re->i.cfra= cfra; if(recurs_depth==0) { - /* otherwise sequencer animation isnt updated */ + /* otherwise sequencer animation isn't updated */ BKE_animsys_evaluate_all_animation(re->main, re->scene, (float)cfra); // XXX, was BKE_curframe(re->scene) } @@ -2332,7 +2332,7 @@ void RE_init_threadcount(Render *re) } /* loads in image into a result, size must match - * x/y offsets are only used on a partial copy when dimensions dont match */ + * x/y offsets are only used on a partial copy when dimensions don't match */ void RE_layer_load_from_file(RenderLayer *layer, ReportList *reports, const char *filename, int x, int y) { ImBuf *ibuf = IMB_loadiffname(filename, IB_rect); diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index c072a664fff..355bae0d2d8 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -741,13 +741,13 @@ static void traceray(ShadeInput *origshi, ShadeResult *origshr, short depth, con shi.osatex= origshi->osatex; shi.depth= origshi->depth + 1; /* only used to indicate tracing */ shi.thread= origshi->thread; - //shi.sample= 0; // memset above, so dont need this + //shi.sample= 0; // memset above, so don't need this shi.xs= origshi->xs; shi.ys= origshi->ys; shi.lay= origshi->lay; shi.passflag= SCE_PASS_COMBINED; /* result of tracing needs no pass info */ shi.combinedflag= 0xFFFFFF; /* ray trace does all options */ - //shi.do_preview= 0; // memset above, so dont need this + //shi.do_preview= 0; // memset above, so don't need this shi.light_override= origshi->light_override; shi.mat_override= origshi->mat_override; diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c index c04daa11b3e..81e8b5d73fe 100644 --- a/source/blender/render/intern/source/renderdatabase.c +++ b/source/blender/render/intern/source/renderdatabase.c @@ -90,7 +90,7 @@ /* ------------------------------------------------------------------------- */ -/* More dynamic allocation of options for render vertices and faces, so we dont +/* More dynamic allocation of options for render vertices and faces, so we don't * have to reserve this space inside vertices. * Important; vertices and faces, should have been created already (to get tables * checked) that's a reason why the calls demand VertRen/VlakRen * as arg, not diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c index 5f034ee9aeb..b5ace10fc07 100644 --- a/source/blender/render/intern/source/strand.c +++ b/source/blender/render/intern/source/strand.c @@ -680,7 +680,7 @@ static void strand_render(Render *re, StrandSegment *sseg, float winmat[][4], St zbufclip4(re, &zspan[a], obi, index, p1->hoco2, p1->hoco1, p2->hoco1, p2->hoco2, p1->clip2, p1->clip1, p2->clip1, p2->clip2); #endif /* only render a line for now, which makes the shadow map more - * similiar across frames, and so reduces flicker */ + * similar across frames, and so reduces flicker */ zbufsinglewire(&zspan[a], obi, index, hoco1, hoco2); } } diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c index 88571bb297b..839963e12b9 100644 --- a/source/blender/render/intern/source/voxeldata.c +++ b/source/blender/render/intern/source/voxeldata.c @@ -65,7 +65,7 @@ static int is_vd_res_ok(VoxelData *vd) { - /* arbitrary large value so corrupt headers dont break */ + /* arbitrary large value so corrupt headers don't break */ const int min= 1, max= 100000; return (vd->resol[0] >= min && vd->resol[0] <= max) && (vd->resol[1] >= min && vd->resol[1] <= max) && diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index c2cb3181e3e..25915444657 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -348,8 +348,8 @@ typedef struct wmEvent { int mval[2]; /* region mouse position, name convention pre 2.5 :) */ char utf8_buf[6]; /* from, ghost if utf8 is enabled for the platform, * BLI_str_utf8_size() must _always_ be valid, check - * when assigning s we dont need to check on every access after */ - char ascii; /* from ghost, fallback if utf8 isnt set */ + * when assigning s we don't need to check on every access after */ + char ascii; /* from ghost, fallback if utf8 isn't set */ char pad; /* previous state */ diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 0c2cb7dab3e..1e2c48f4e7f 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -398,7 +398,7 @@ void WM_read_file(bContext *C, const char *filepath, ReportList *reports) if (retval != BKE_READ_FILE_FAIL) { G.relbase_valid = 1; - if(!G.background) /* assume automated tasks with background, dont write recent file list */ + if(!G.background) /* assume automated tasks with background, don't write recent file list */ write_history(); } @@ -748,7 +748,7 @@ int WM_write_file(bContext *C, const char *target, int fileflags, ReportList *re BLI_strncpy(filepath, target, FILE_MAX); BLI_replace_extension(filepath, FILE_MAX, ".blend"); - /* dont use 'target' anymore */ + /* don't use 'target' anymore */ /* send the OnSave event */ for (li= G.main->library.first; li; li= li->id.next) { diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index 5e09a701755..ba2df4e2363 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -258,7 +258,7 @@ static void *do_job_thread(void *job_v) return NULL; } -/* dont allow same startjob to be executed twice */ +/* don't allow same startjob to be executed twice */ static void wm_jobs_test_suspend_stop(wmWindowManager *wm, wmJob *test) { wmJob *steve; diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index f72939c03b2..ba9ff89f175 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -416,7 +416,7 @@ wmOperatorTypeMacro *WM_operatortype_macro_define(wmOperatorType *ot, const char BLI_addtail(&ot->macro, otmacro); { - /* operator should always be found but in the event its not. dont segfault */ + /* operator should always be found but in the event its not. don't segfault */ wmOperatorType *otsub = WM_operatortype_find(idname, 0); if(otsub) { RNA_def_pointer_runtime(ot->srna, otsub->idname, otsub->srna, @@ -559,7 +559,7 @@ char *WM_operator_pystring(bContext *C, wmOperatorType *ot, PointerRNA *opptr, i buf_default= RNA_property_as_string(C, &opptr_default, prop_default); if(strcmp(buf, buf_default)==0) - ok= 0; /* values match, dont bother printing */ + ok= 0; /* values match, don't bother printing */ MEM_freeN(buf_default); } @@ -773,7 +773,7 @@ static uiBlock *wm_enum_search_menu(bContext *C, ARegion *ar, void *arg_op) block= uiBeginBlock(C, ar, "_popup", UI_EMBOSS); uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_RET_1|UI_BLOCK_MOVEMOUSE_QUIT); - //uiDefBut(block, LABEL, 0, op->type->name, 10, 10, 180, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, ""); // ok, this isnt so easy... + //uiDefBut(block, LABEL, 0, op->type->name, 10, 10, 180, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, ""); // ok, this isn't so easy... but= uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, sizeof(search), 10, 10, 9*UI_UNIT_X, UI_UNIT_Y, 0, 0, ""); uiButSetSearchFunc(but, operator_enum_search_cb, op->type, operator_enum_call_cb, NULL); @@ -1250,7 +1250,7 @@ static int wm_resource_check_prev(void) #if 0 /* ignore the local folder */ if(res == NULL) { - /* with a local dir, copying old files isnt useful since local dir get priority for config */ + /* with a local dir, copying old files isn't useful since local dir get priority for config */ res= BLI_get_folder_version(BLENDER_RESOURCE_PATH_LOCAL, BLENDER_VERSION, TRUE); } #endif @@ -2530,7 +2530,7 @@ int WM_gesture_circle_modal(bContext *C, wmOperator *op, wmEvent *event) case GESTURE_MODAL_CANCEL: case GESTURE_MODAL_CONFIRM: wm_gesture_end(C, op); - return OPERATOR_FINISHED; /* use finish or we dont get an undo */ + return OPERATOR_FINISHED; /* use finish or we don't get an undo */ } } // // Allow view navigation??? diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 4ccebf7a4ff..0782daac03f 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -210,7 +210,7 @@ static int find_free_winid(wmWindowManager *wm) return id; } -/* dont change context itself */ +/* don't change context itself */ wmWindow *wm_window_new(bContext *C) { wmWindowManager *wm= CTX_wm_manager(C); @@ -1126,7 +1126,7 @@ void wm_window_get_size(wmWindow *win, int *width_r, int *height_r) } /* exceptional case: - splash is called before events are processed - * this means we dont actually know the window size so get this from GHOST */ + * this means we don't actually know the window size so get this from GHOST */ void wm_window_get_size_ghost(wmWindow *win, int *width_r, int *height_r) { GHOST_RectangleHandle bounds= GHOST_GetClientBounds(win->ghostwin); diff --git a/source/creator/creator.c b/source/creator/creator.c index 3cc2c4f1c4c..eb5761bb095 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -1196,7 +1196,7 @@ int main(int argc, const char **argv) /* background render uses this font too */ BKE_font_register_builtin(datatoc_Bfont, datatoc_Bfont_size); - /* Initialiaze ffmpeg if built in, also needed for bg mode if videos are + /* Initialize ffmpeg if built in, also needed for bg mode if videos are * rendered via ffmpeg */ sound_init_once(); diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 89877261cd7..33cbbe3ee86 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -636,7 +636,7 @@ bool ConvertMaterial( } } } -#if 0 /* this flag isnt used anymore */ +#if 0 /* this flag isn't used anymore */ material->flag[i] |= (BKE_animdata_from_id(mat->id) != NULL) ? HASIPO : 0; #endif /// -------------------------------- diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index 72a953247d5..ee60d2c5bc5 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -537,7 +537,7 @@ void KX_BlenderSceneConverter::RegisterGameMesh( RAS_MeshObject *gamemesh, struct Mesh *for_blendermesh) { - if(for_blendermesh) { /* dynamically loaded meshes we dont want to keep lookups for */ + if(for_blendermesh) { /* dynamically loaded meshes we don't want to keep lookups for */ m_map_mesh_to_gamemesh.insert(CHashedPtr(for_blendermesh),gamemesh); } m_meshobjects.push_back(pair<KX_Scene*,RAS_MeshObject*>(m_currentScene,gamemesh)); @@ -859,7 +859,7 @@ void KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber) if (icu_ry) insert_vert_icu(icu_ry, frameNumber, eulerAngles[1], 1); if (icu_rz) insert_vert_icu(icu_rz, frameNumber, eulerAngles[2], 1); - // Handles are corrected at the end, testhandles_ipocurve isnt needed yet + // Handles are corrected at the end, testhandles_ipocurve isn't needed yet #endif } } @@ -953,7 +953,7 @@ bool KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const cha Main *main_tmp= NULL; /* created only for linking, then freed */ LinkNode *names = NULL; int idcode= BKE_idcode_from_name(group); - short flag= 0; /* dont need any special options */ + short flag= 0; /* don't need any special options */ ReportList reports; static char err_local[255]; @@ -1059,7 +1059,7 @@ bool KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const cha KX_Scene* other= m_ketsjiEngine->CreateScene((Scene *)scene); scene_merge->MergeScene(other); - // RemoveScene(other); // Dont run this, it frees the entire scene converter data, just delete the scene + // RemoveScene(other); // Don't run this, it frees the entire scene converter data, just delete the scene delete other; } @@ -1078,7 +1078,7 @@ bool KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const cha return true; } -/* Note m_map_*** are all ok and dont need to be freed +/* Note m_map_*** are all ok and don't need to be freed * most are temp and NewRemoveObject frees m_map_gameobject_to_blender */ bool KX_BlenderSceneConverter::FreeBlendFile(struct Main *maggie) { @@ -1231,7 +1231,7 @@ bool KX_BlenderSceneConverter::FreeBlendFile(struct Main *maggie) #endif - /* Worlds dont reference original blender data so we need to make a set from them */ + /* Worlds don't reference original blender data so we need to make a set from them */ typedef std::set<KX_WorldInfo*> KX_WorldInfoSet; KX_WorldInfoSet worldset; for (int scene_idx=0;scene_idx<numScenes;scene_idx++) diff --git a/source/gameengine/Converter/KX_ConvertProperties.cpp b/source/gameengine/Converter/KX_ConvertProperties.cpp index 8eea39c4956..791f99b53c0 100644 --- a/source/gameengine/Converter/KX_ConvertProperties.cpp +++ b/source/gameengine/Converter/KX_ConvertProperties.cpp @@ -141,7 +141,7 @@ void BL_ConvertProperties(Object* object,KX_GameObject* gameobj,SCA_TimeEventMan } #ifdef WITH_PYTHON - /* Warn if we double up on attributes, this isnt quite right since it wont find inherited attributes however there arnt many */ + /* Warn if we double up on attributes, this isn't quite right since it wont find inherited attributes however there arnt many */ for(PyAttributeDef *attrdef = KX_GameObject::Attributes; attrdef->m_name; attrdef++) { if(strcmp(prop->name, attrdef->m_name)==0) { printf("Warning! user defined property name \"%s\" is also a python attribute for object \"%s\"\n\tUse ob[\"%s\"] syntax to avoid conflict\n", prop->name, object->id.name+2, prop->name); diff --git a/source/gameengine/Converter/KX_IpoConvert.cpp b/source/gameengine/Converter/KX_IpoConvert.cpp index a56fbe5bef2..d0002f3b3e7 100644 --- a/source/gameengine/Converter/KX_IpoConvert.cpp +++ b/source/gameengine/Converter/KX_IpoConvert.cpp @@ -102,7 +102,7 @@ SG_Controller *BL_CreateIPO(struct bAction *action, KX_GameObject* gameobj, KX_B rotmode = "rotation_axis_angle"; drotmode = "delta_rotation_axis_angle"; break; - case ROT_MODE_QUAT: /* XXX, this isnt working, currently only eulers are supported [#28853] */ + case ROT_MODE_QUAT: /* XXX, this isn't working, currently only eulers are supported [#28853] */ rotmode = "rotation_quaternion"; drotmode = "delta_rotation_quaternion"; break; diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp index 4e048b1a875..2c8cffbef82 100644 --- a/source/gameengine/Expressions/ListValue.cpp +++ b/source/gameengine/Expressions/ListValue.cpp @@ -400,7 +400,7 @@ static PyObject *listvalue_buffer_concat(PyObject * self, PyObject * other) // and CListValue concatenated to Python Lists // and CListValue concatenated with another CListValue - /* Shallow copy, dont use listval->GetReplica(), it will screw up with KX_GameObjects */ + /* Shallow copy, don't use listval->GetReplica(), it will screw up with KX_GameObjects */ CListValue* listval_new = new CListValue(); if (PyList_Check(other)) @@ -428,7 +428,7 @@ static PyObject *listvalue_buffer_concat(PyObject * self, PyObject * other) } if (error) { - listval_new->Resize(numitems_orig+i); /* resize so we dont try release NULL pointers */ + listval_new->Resize(numitems_orig+i); /* resize so we don't try release NULL pointers */ listval_new->Release(); return NULL; /* ConvertPythonToValue above sets the error */ } @@ -446,7 +446,7 @@ static PyObject *listvalue_buffer_concat(PyObject * self, PyObject * other) numitems = otherval->GetCount(); /* copy the first part of the list */ - listval_new->Resize(numitems_orig + numitems); /* resize so we dont try release NULL pointers */ + listval_new->Resize(numitems_orig + numitems); /* resize so we don't try release NULL pointers */ for (i=0;i<numitems_orig;i++) listval_new->SetValue(i, listval->GetValue(i)->AddRef()); diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp index 27d955edf44..65aa3e23dfa 100644 --- a/source/gameengine/Expressions/PyObjectPlus.cpp +++ b/source/gameengine/Expressions/PyObjectPlus.cpp @@ -282,7 +282,7 @@ PyObject *PyObjectPlus::py_get_attrdef(PyObject *self_py, const PyAttributeDef * char* ptr = (attrdef->m_usePtr) ? (char*)BGE_PROXY_PTR(self_py) : (char*)ref; if(ptr == NULL || (BGE_PROXY_PYREF(self_py) && (ref==NULL || !ref->py_is_valid()))) { if(attrdef == attr_invalid) - Py_RETURN_TRUE; // dont bother running the function + Py_RETURN_TRUE; // don't bother running the function PyErr_SetString(PyExc_SystemError, BGE_PROXY_ERROR_MSG); return NULL; @@ -698,7 +698,7 @@ int PyObjectPlus::py_set_attrdef(PyObject *self_py, PyObject *value, const PyAtt { if ((*attrdef->m_checkFunction)(ref, attrdef) != 0) { - // if the checing function didnt set an error then set a generic one here so we dont set an error with no exception + // if the checing function didnt set an error then set a generic one here so we don't set an error with no exception if (PyErr_Occurred()==0) PyErr_Format(PyExc_AttributeError, "type check error for attribute \"%s\", reasion unknown", attrdef->m_name); diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h index 6de0f3fa8d5..278febee4ac 100644 --- a/source/gameengine/Expressions/PyObjectPlus.h +++ b/source/gameengine/Expressions/PyObjectPlus.h @@ -106,7 +106,7 @@ typedef struct PyObjectPlus_Proxy { # define BGE_PROXY_WKREF(_self) (((PyObjectPlus_Proxy *)_self)->in_weakreflist) #endif -/* Note, sometimes we dont care what BGE type this is as long as its a proxy */ +/* Note, sometimes we don't care what BGE type this is as long as its a proxy */ #define BGE_PROXY_CHECK_TYPE(_type) ((_type)->tp_dealloc == PyObjectPlus::py_base_dealloc) /* Opposite of BGE_PROXY_REF */ diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp index cc7c7f9b281..c0952f29d8f 100644 --- a/source/gameengine/Expressions/Value.cpp +++ b/source/gameengine/Expressions/Value.cpp @@ -585,7 +585,7 @@ CValue* CValue::ConvertPythonToValue(PyObject* pyobj, const char *error_prefix) { vallie = new CStringValue(_PyUnicode_AsString(pyobj),""); } else - if (PyObject_TypeCheck(pyobj, &CValue::Type)) /* Note, dont let these get assigned to GameObject props, must check elsewhere */ + if (PyObject_TypeCheck(pyobj, &CValue::Type)) /* Note, don't let these get assigned to GameObject props, must check elsewhere */ { vallie = (static_cast<CValue *>(BGE_PROXY_REF(pyobj)))->AddRef(); } else diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp index 15aeef242b7..b22246014bf 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp +++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp @@ -89,7 +89,7 @@ SCA_Joystick *SCA_Joystick::GetInstance( short int joyindex ) { int i; // The video subsystem is required for joystick input to work. However, - // when GHOST is running under SDL, video is initialised elsewhere. + // when GHOST is running under SDL, video is initialized elsewhere. // Do this once only. # ifdef WITH_GHOST_SDL if(SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1 ){ diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp index 3612115f90e..3f74b4cd807 100644 --- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp +++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp @@ -109,7 +109,7 @@ bool SCA_JoystickSensor::Evaluate() bool result = false; bool reset = m_reset && m_level; - if(js==NULL) /* no joystick - dont do anything */ + if(js==NULL) /* no joystick - don't do anything */ return false; m_reset = false; @@ -129,7 +129,7 @@ bool SCA_JoystickSensor::Evaluate() with expect a zero index. */ - if (!js->IsTrigAxis() && !reset) /* No events from SDL? - dont bother */ + if (!js->IsTrigAxis() && !reset) /* No events from SDL? - don't bother */ return false; js->cSetPrecision(m_precision); @@ -159,8 +159,8 @@ bool SCA_JoystickSensor::Evaluate() } case KX_JOYSENSORMODE_AXIS_SINGLE: { - /* Like KX_JOYSENSORMODE_AXIS but dont pair up axis */ - if (!js->IsTrigAxis() && !reset) /* No events from SDL? - dont bother */ + /* Like KX_JOYSENSORMODE_AXIS but don't pair up axis */ + if (!js->IsTrigAxis() && !reset) /* No events from SDL? - don't bother */ return false; /* No need for 'm_bAllEvents' check here since were only checking 1 axis */ @@ -182,7 +182,7 @@ bool SCA_JoystickSensor::Evaluate() /* what is what! m_button = the actual button in question */ - if (!js->IsTrigButton() && !reset) /* No events from SDL? - dont bother */ + if (!js->IsTrigButton() && !reset) /* No events from SDL? - don't bother */ return false; if(( m_bAllEvents && js->aAnyButtonPressIsPositive()) || (!m_bAllEvents && js->aButtonPressIsPositive(m_button))) { @@ -203,7 +203,7 @@ bool SCA_JoystickSensor::Evaluate() direction= m_hatf -- max 12 */ - if (!js->IsTrigHat() && !reset) /* No events from SDL? - dont bother */ + if (!js->IsTrigHat() && !reset) /* No events from SDL? - don't bother */ return false; if((m_bAllEvents && js->GetHat(m_hat-1)) || js->aHatIsPositive(m_hat-1, m_hatf)) { diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp index 399ea8d80dd..d7f408d0b4a 100644 --- a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp +++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp @@ -294,7 +294,7 @@ bool SCA_KeyboardSensor::Evaluate() } /* Modify the key state based on qual(s) - * Tested carefully. dont touch unless your really sure. + * Tested carefully. don't touch unless your really sure. * note, this will only change the results if key modifiers are set. * * When all modifiers and keys are positive diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp index 5413638391f..69a37ebe88a 100644 --- a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp +++ b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp @@ -83,7 +83,7 @@ bool SCA_PropertyActuator::Update() if (m_type==KX_ACT_PROP_TOGGLE) { - /* dont use */ + /* don't use */ CValue* newval; CValue* oldprop = propowner->GetProperty(m_propname); if (oldprop) diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp index 11ea7e51858..67c813acdc0 100644 --- a/source/gameengine/GameLogic/SCA_PythonController.cpp +++ b/source/gameengine/GameLogic/SCA_PythonController.cpp @@ -353,7 +353,7 @@ bool SCA_PythonController::Import() return false; } - m_function_argc = 0; /* rare cases this could be a function that isnt defined in python, assume zero args */ + m_function_argc = 0; /* rare cases this could be a function that isn't defined in python, assume zero args */ if (PyFunction_Check(m_function)) { m_function_argc= ((PyCodeObject *)PyFunction_GET_CODE(m_function))->co_argcount; } diff --git a/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h b/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h index a935db94020..4391dcb304b 100644 --- a/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h +++ b/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h @@ -53,7 +53,7 @@ class SCA_RandomNumberGenerator { unsigned long mt[624]; /** mti==N+1 means mt[KX_MT_VectorLenght] is not initialized */ - int mti; /* initialised in the cpp file */ + int mti; /* initialized in the cpp file */ /** Calculate a start vector */ void SetStartVector(void); diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp index 28e7f221ce4..46753dcaffe 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp @@ -543,7 +543,7 @@ bool KX_ReInstanceBulletShapeFromMesh(KX_GameObject *gameobj, KX_GameObject *fro CcdShapeConstructionInfo *shapeInfo; /* if this is the child of a compound shape this can happen - * dont support compound shapes for now */ + * don't support compound shapes for now */ if(spc==NULL) return false; diff --git a/source/gameengine/Ketsji/KX_Dome.cpp b/source/gameengine/Ketsji/KX_Dome.cpp index 6e989dd4d7d..4d022b97ba6 100644 --- a/source/gameengine/Ketsji/KX_Dome.cpp +++ b/source/gameengine/Ketsji/KX_Dome.cpp @@ -229,7 +229,7 @@ void KX_Dome::CalculateImageSize(void) { /* * - determine the minimum buffer size - * - reduce the buffer for better performace + * - reduce the buffer for better performance * - create a power of 2 texture bigger than the buffer */ canvaswidth = m_canvas->GetWidth(); @@ -734,7 +734,7 @@ void KX_Dome::CreateMeshDome250(void) * verts_height is the exactly needed height of the cube faces (not always 1.0). * When we want some horizontal information (e.g. for horizontal 220deg domes) we don't need to create and tesselate the whole cube. * Therefore the lateral cube faces could be small, and the tesselate mesh would be completely used. - * (if we always worked with verts_height = 1.0, we would be discarding a lot of the calculated and tesselated geometry). + * (if we always worked with verts_height = 1.0, we would be discarding a lot of the calculated and tessellated geometry). * * So I came out with this formula: * verts_height = tan((rad_ang/2) - (MT_PI/2))*sqrt(2.0); diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index 43cd16340d0..1bc60ebd337 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -1788,7 +1788,7 @@ static int Map_SetItem(PyObject *self_v, PyObject *key, PyObject *val) int set= 0; /* as CValue */ - if(attr_str && PyObject_TypeCheck(val, &PyObjectPlus::Type)==0) /* dont allow GameObjects for eg to be assigned to CValue props */ + if(attr_str && PyObject_TypeCheck(val, &PyObjectPlus::Type)==0) /* don't allow GameObjects for eg to be assigned to CValue props */ { CValue* vallie = self->ConvertPythonToValue(val, ""); /* error unused */ diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h index b37ebd250a5..0a50ab0a43a 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.h +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h @@ -79,7 +79,7 @@ private: class KX_ISceneConverter* m_sceneconverter; class NG_NetworkDeviceInterface* m_networkdevice; #ifdef WITH_PYTHON - /* borrowed from sys.modules["__main__"], dont manage ref's */ + /* borrowed from sys.modules["__main__"], don't manage ref's */ PyObject* m_pythondictionary; #endif class SCA_IInputDevice* m_keyboarddevice; diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 82016e2fff3..b804bacf79e 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -1757,7 +1757,7 @@ static void initPySysObjects__append(PyObject *sys_path, const char *filename) BLI_split_dir_part(filename, expanded, sizeof(expanded)); /* get the dir part of filename only */ BLI_path_abs(expanded, gp_GamePythonPath); /* filename from lib->filename is (always?) absolute, so this may not be needed but it wont hurt */ - BLI_cleanup_file(gp_GamePythonPath, expanded); /* Dont use BLI_cleanup_dir because it adds a slash - BREAKS WIN32 ONLY */ + BLI_cleanup_file(gp_GamePythonPath, expanded); /* Don't use BLI_cleanup_dir because it adds a slash - BREAKS WIN32 ONLY */ item= PyUnicode_DecodeFSDefault(expanded); // printf("SysPath - '%s', '%s', '%s'\n", expanded, filename, gp_GamePythonPath); @@ -1831,7 +1831,7 @@ static struct _inittab bge_internal_modules[]= { }; /** - * Python is not initialised. + * Python is not initialized. * see bpy_interface.c's BPY_python_start() which shares the same functionality in blender. */ PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecurityLevel level, Main *maggie, int argc, char** argv) @@ -1859,7 +1859,7 @@ PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecur Py_Initialize(); - if(argv && first_time) { /* browser plugins dont currently set this */ + if(argv && first_time) { /* browser plugins don't currently set this */ // Until python support ascii again, we use our own. // PySys_SetArgv(argc, argv); int i; @@ -1874,14 +1874,14 @@ PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecur bpy_import_init(PyEval_GetBuiltins()); - /* mathutils types are used by the BGE even if we dont import them */ + /* mathutils types are used by the BGE even if we don't import them */ { PyObject *mod= PyImport_ImportModuleLevel((char *)"mathutils", NULL, NULL, NULL, 0); Py_DECREF(mod); } #ifdef WITH_AUDASPACE - /* accessing a SoundActuator's sound results in a crash if aud is not initialised... */ + /* accessing a SoundActuator's sound results in a crash if aud is not initialized... */ { PyObject *mod= PyImport_ImportModuleLevel((char *)"aud", NULL, NULL, NULL, 0); Py_DECREF(mod); @@ -1933,7 +1933,7 @@ PyObject* initGamePythonScripting(const STR_String& progname, TPythonSecurityLev Py_FrozenFlag=1; #ifdef WITH_AUDASPACE - /* accessing a SoundActuator's sound results in a crash if aud is not initialised... */ + /* accessing a SoundActuator's sound results in a crash if aud is not initialized... */ { PyObject *mod= PyImport_ImportModuleLevel((char *)"aud", NULL, NULL, NULL, 0); Py_DECREF(mod); diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 74a0abe526d..17ef358a4e5 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1889,7 +1889,7 @@ bool KX_Scene::MergeScene(KX_Scene *other) other->GetLightList()->ReleaseAndRemoveAll(); #ifdef USE_BULLET - if(env) /* bullet scene? - dummy scenes dont need touching */ + if(env) /* bullet scene? - dummy scenes don't need touching */ env->MergeEnvironment(env_other); #endif @@ -1910,7 +1910,7 @@ bool KX_Scene::MergeScene(KX_Scene *other) if(evtmgr_other) /* unlikely but possible one scene has a joystick and not the other */ evtmgr_other->Replace_LogicManager(logicmgr); - /* when merging objects sensors are moved across into the new manager, dont need to do this here */ + /* when merging objects sensors are moved across into the new manager, don't need to do this here */ } /* grab any timer properties from the other scene */ @@ -2271,7 +2271,7 @@ KX_PYMETHODDEF_DOC(KX_Scene, addObject, SCA_IObject* replica = AddReplicaObject((SCA_IObject*)ob, other, time); // release here because AddReplicaObject AddRef's - // the object is added to the scene so we dont want python to own a reference + // the object is added to the scene so we don't want python to own a reference replica->Release(); return replica->GetProxy(); } diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index cf8a729aa88..0ece33a7f06 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -1924,7 +1924,7 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject* gameobj, class RA m_triFaceArray.resize(tot_bt_tris*3); int *tri_pt= &m_triFaceArray[0]; - /* cant be used for anything useful in this case, since we dont rely on the original mesh + /* cant be used for anything useful in this case, since we don't rely on the original mesh * will just be an array like pythons range(tot_bt_tris) */ m_polygonIndexArray.resize(tot_bt_tris); @@ -1986,7 +1986,7 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject* gameobj, class RA /* force recreation of the m_unscaledShape. * If this has multiple users we cant delete */ if(m_unscaledShape) { - // dont free now so it can re-allocate under the same location and not break pointers. + // don't free now so it can re-allocate under the same location and not break pointers. // DeleteBulletShape(m_unscaledShape); m_forceReInstance= true; } diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp index 9706de20b79..99346c0a6c6 100644 --- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp +++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp @@ -58,7 +58,7 @@ numberoffilters(0), need_tex_update(true) isshadersupported = GLEW_ARB_shader_objects && GLEW_ARB_fragment_shader && GLEW_ARB_multitexture; - /* used to return before 2.49 but need to initialize values so dont */ + /* used to return before 2.49 but need to initialize values so don't */ if(!isshadersupported) std::cout<<"shaders not supported!" << std::endl; diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.h b/source/gameengine/Rasterizer/RAS_MaterialBucket.h index 4142ebd2e39..cff4d67d44b 100644 --- a/source/gameengine/Rasterizer/RAS_MaterialBucket.h +++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.h @@ -82,7 +82,7 @@ class RAS_DisplayArray public: vector<RAS_TexVert> m_vertex; vector<unsigned short> m_index; - /* LINE currently isnt used */ + /* LINE currently isn't used */ enum { LINE = 2, TRIANGLE = 3, QUAD = 4 } m_type; //RAS_MeshSlot *m_origSlot; diff --git a/source/gameengine/Rasterizer/RAS_TexVert.cpp b/source/gameengine/Rasterizer/RAS_TexVert.cpp index 454fd8ecc69..f74aa24232b 100644 --- a/source/gameengine/Rasterizer/RAS_TexVert.cpp +++ b/source/gameengine/Rasterizer/RAS_TexVert.cpp @@ -123,14 +123,14 @@ bool RAS_TexVert::closeTo(const RAS_TexVert* other) { return ( /* m_flag == other->m_flag && */ - /* at the moment the face only stores the smooth/flat setting so dont bother comparing it */ + /* at the moment the face only stores the smooth/flat setting so don't bother comparing it */ m_rgba == other->m_rgba && MT_fuzzyEqual(MT_Vector3(m_normal), MT_Vector3(other->m_normal)) && MT_fuzzyEqual(MT_Vector3(m_tangent), MT_Vector3(other->m_tangent)) && MT_fuzzyEqual(MT_Vector2(m_uv1), MT_Vector2(other->m_uv1)) && MT_fuzzyEqual(MT_Vector2(m_uv2), MT_Vector2(other->m_uv2)) /* && MT_fuzzyEqual(MT_Vector3(m_localxyz), MT_Vector3(other->m_localxyz))*/); - /* dont bother comparing m_localxyz since we know there from the same vert */ + /* don't bother comparing m_localxyz since we know there from the same vert */ } short RAS_TexVert::getFlag() const diff --git a/source/tests/bl_mesh_modifiers.py b/source/tests/bl_mesh_modifiers.py index 0495f5d9f98..0ab2213c0e1 100644 --- a/source/tests/bl_mesh_modifiers.py +++ b/source/tests/bl_mesh_modifiers.py @@ -20,7 +20,7 @@ # Currently this script only generates images from different modifier # combinations and does not validate they work correctly, -# this is because we dont get 1:1 match with bmesh. +# this is because we don't get 1:1 match with bmesh. # # Later, we may have a way to check the results are valid. diff --git a/source/tests/pep8.py b/source/tests/pep8.py index 4b957f20907..d12397ea81d 100644 --- a/source/tests/pep8.py +++ b/source/tests/pep8.py @@ -52,7 +52,7 @@ def is_pep8(path): if open(path, 'rb').read(3) == b'\xef\xbb\xbf': print("\nfile contains BOM, remove first 3 bytes: %r\n" % path) - # templates dont have a header but should be pep8 + # templates don't have a header but should be pep8 for d in ("presets", "templates", "examples"): if ("%s%s%s" % (os.sep, d, os.sep)) in path: return 1 |