diff options
Diffstat (limited to 'source/blender/blenkernel/intern')
36 files changed, 80 insertions, 80 deletions
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); |