diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-21 02:56:26 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-21 02:56:26 +0400 |
commit | 303cecf1398c0049df515aba3898883d8cdc81d5 (patch) | |
tree | 888e575fcc1932bd9121594221272174fad177ea /source/blender/blenkernel/intern | |
parent | 6193c47c39dc72472f4b83b3e3c875103c31e5b6 (diff) |
spelling cleanup: tesselate -> tessellate (last of these found)
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 12 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/bvhutils.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/displist.c | 38 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/modifiers_bmesh.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 2 |
6 files changed, 32 insertions, 32 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 68264ddd200..b599c325e64 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -384,8 +384,8 @@ void DM_ensure_tessface(DerivedMesh *dm) } } -/* Update tessface CD data from loop/poly ones. Needed when not retesselating after modstack evaluation. */ -/* NOTE: Assumes dm has valid tesselated data! */ +/* Update tessface CD data from loop/poly ones. Needed when not retessellating after modstack evaluation. */ +/* NOTE: Assumes dm has valid tessellated data! */ void DM_update_tessface_data(DerivedMesh *dm) { MFace *mf = dm->getTessFaceArray(dm); @@ -522,7 +522,7 @@ void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob) } } - /* yes, must be before _and_ after tesselate */ + /* yes, must be before _and_ after tessellate */ mesh_update_customdata_pointers(&tmp, TRUE); BKE_mesh_tessface_calc(&tmp); @@ -1350,7 +1350,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos Mesh *me = ob->data; ModifierData *firstmd, *md, *previewmd = NULL; LinkNode *datamasks, *curr; - /* XXX Always copying POLYINDEX, else tesselated data are no more valid! */ + /* XXX Always copying POLYINDEX, else tessellated data are no more valid! */ CustomDataMask mask, nextmask, append_mask = CD_MASK_POLYINDEX; float (*deformedVerts)[3] = NULL; DerivedMesh *dm=NULL, *orcodm, *clothorcodm, *finaldm; @@ -1780,10 +1780,10 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos { finaldm->recalcTessellation(finaldm); } - /* Even if tesselation is not needed, some modifiers migh have modified CD layers + /* Even if tessellation is not needed, some modifiers migh have modified CD layers * (like mloopcol or mloopuv), hence we have to update those. */ else if (finaldm->dirty & DM_DIRTY_TESS_CDLAYERS) { - /* A tesselation already exists, it should always have a CD_POLYINDEX. */ + /* A tessellation already exists, it should always have a CD_POLYINDEX. */ BLI_assert(CustomData_has_layer(&finaldm->faceData, CD_POLYINDEX)); DM_update_tessface_data(finaldm); } diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 167104e1da9..2a9b17c331b 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -524,7 +524,7 @@ BVHTree* bvhtree_from_mesh_faces(BVHTreeFromMesh *data, DerivedMesh *mesh, float int numFaces= mesh->getNumTessFaces(mesh); /* BMESH spesific check that we have tessfaces, - * we _could_ tesselate here but rather not - campbell + * we _could_ tessellate here but rather not - campbell * * this assert checks we have tessfaces, * if not caller should use DM_ensure_tessface() */ diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index a1b1da32af7..7142dc38da3 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -686,10 +686,10 @@ void makeDispListMBall_forRender(Scene *scene, Object *ob, ListBase *dispbase) object_deform_mball(ob, dispbase); } -static ModifierData *curve_get_tesselate_point(Scene *scene, Object *ob, int forRender, int editmode) +static ModifierData *curve_get_tessellate_point(Scene *scene, Object *ob, int forRender, int editmode) { ModifierData *md = modifiers_getVirtualModifierList(ob); - ModifierData *preTesselatePoint; + ModifierData *pretessellatePoint; int required_mode; if(forRender) required_mode = eModifierMode_Render; @@ -697,32 +697,32 @@ static ModifierData *curve_get_tesselate_point(Scene *scene, Object *ob, int for if(editmode) required_mode |= eModifierMode_Editmode; - preTesselatePoint = NULL; + pretessellatePoint = NULL; for (; md; md=md->next) { ModifierTypeInfo *mti = modifierType_getInfo(md->type); if (!modifier_isEnabled(scene, md, required_mode)) continue; - if (mti->type == eModifierTypeType_Constructive) return preTesselatePoint; + if (mti->type == eModifierTypeType_Constructive) return pretessellatePoint; if (ELEM3(md->type, eModifierType_Hook, eModifierType_Softbody, eModifierType_MeshDeform)) { - preTesselatePoint = md; + pretessellatePoint = md; /* this modifiers are moving point of tessellation automatically * (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) { - preTesselatePoint = md; + pretessellatePoint = md; } } - return preTesselatePoint; + return pretessellatePoint; } static void curve_calc_modifiers_pre(Scene *scene, Object *ob, int forRender, float (**originalVerts_r)[3], float (**deformedVerts_r)[3], int *numVerts_r) { ModifierData *md = modifiers_getVirtualModifierList(ob); - ModifierData *preTesselatePoint; + ModifierData *pretessellatePoint; Curve *cu= ob->data; ListBase *nurb= BKE_curve_nurbs(cu); int numVerts = 0; @@ -735,7 +735,7 @@ static void curve_calc_modifiers_pre(Scene *scene, Object *ob, int forRender, fl if(forRender) required_mode = eModifierMode_Render; else required_mode = eModifierMode_Realtime; - preTesselatePoint = curve_get_tesselate_point(scene, ob, forRender, editmode); + pretessellatePoint = curve_get_tessellate_point(scene, ob, forRender, editmode); if(editmode) required_mode |= eModifierMode_Editmode; @@ -753,7 +753,7 @@ static void curve_calc_modifiers_pre(Scene *scene, Object *ob, int forRender, fl } } - if (preTesselatePoint) { + if (pretessellatePoint) { for (; md; md=md->next) { ModifierTypeInfo *mti = modifierType_getInfo(md->type); @@ -770,7 +770,7 @@ static void curve_calc_modifiers_pre(Scene *scene, Object *ob, int forRender, fl mti->deformVerts(md, ob, NULL, deformedVerts, numVerts, forRender, editmode); - if (md==preTesselatePoint) + if (md==pretessellatePoint) break; } } @@ -826,7 +826,7 @@ static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispba DerivedMesh **derivedFinal, int forRender, float (*originalVerts)[3], float (*deformedVerts)[3]) { ModifierData *md = modifiers_getVirtualModifierList(ob); - ModifierData *preTesselatePoint; + ModifierData *pretessellatePoint; Curve *cu= ob->data; ListBase *nurb= BKE_curve_nurbs(cu); int required_mode = 0, totvert = 0; @@ -838,12 +838,12 @@ static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispba if(forRender) required_mode = eModifierMode_Render; else required_mode = eModifierMode_Realtime; - preTesselatePoint = curve_get_tesselate_point(scene, ob, forRender, editmode); + pretessellatePoint = curve_get_tessellate_point(scene, ob, forRender, editmode); if(editmode) required_mode |= eModifierMode_Editmode; - if (preTesselatePoint) { - md = preTesselatePoint->next; + if (pretessellatePoint) { + md = pretessellatePoint->next; } if (derivedFinal && *derivedFinal) { @@ -1037,7 +1037,7 @@ static void curve_calc_orcodm(Scene *scene, Object *ob, DerivedMesh *derivedFina /* for displist-based objects */ ModifierData *md = modifiers_getVirtualModifierList(ob); - ModifierData *preTesselatePoint; + ModifierData *pretessellatePoint; Curve *cu= ob->data; int required_mode; int editmode = (!forRender && cu->editnurb); @@ -1046,12 +1046,12 @@ static void curve_calc_orcodm(Scene *scene, Object *ob, DerivedMesh *derivedFina if(forRender) required_mode = eModifierMode_Render; else required_mode = eModifierMode_Realtime; - preTesselatePoint = curve_get_tesselate_point(scene, ob, forRender, editmode); + pretessellatePoint = curve_get_tessellate_point(scene, ob, forRender, editmode); if(editmode) required_mode |= eModifierMode_Editmode; - if (preTesselatePoint) { - md = preTesselatePoint->next; + if (pretessellatePoint) { + md = pretessellatePoint->next; } for (; md; md=md->next) { diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index 4c3e92027e8..113e428ce47 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -69,12 +69,12 @@ extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */ -BMEditMesh *BMEdit_Create(BMesh *bm, int do_tesselate) +BMEditMesh *BMEdit_Create(BMesh *bm, int do_tessellate) { BMEditMesh *tm = MEM_callocN(sizeof(BMEditMesh), __func__); tm->bm = bm; - if (do_tesselate) { + if (do_tessellate) { BMEdit_RecalcTessellation(tm); } diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c index 46bdcc6fdd8..20fdd4b2b48 100644 --- a/source/blender/blenkernel/intern/modifiers_bmesh.c +++ b/source/blender/blenkernel/intern/modifiers_bmesh.c @@ -137,7 +137,7 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm) /* converts a cddm to a BMEditMesh. if existing is non-NULL, the * new geometry will be put in there.*/ -BMEditMesh *DM_to_editbmesh(DerivedMesh *dm, BMEditMesh *existing, int do_tesselate) +BMEditMesh *DM_to_editbmesh(DerivedMesh *dm, BMEditMesh *existing, int do_tessellate) { BMEditMesh *em = existing; BMesh *bm; @@ -152,10 +152,10 @@ BMEditMesh *DM_to_editbmesh(DerivedMesh *dm, BMEditMesh *existing, int do_tessel DM_to_bmesh_ex(dm, bm); if (!em) { - em = BMEdit_Create(bm, do_tesselate); + em = BMEdit_Create(bm, do_tessellate); } else { - if (do_tesselate) { + if (do_tessellate) { BMEdit_RecalcTessellation(em); } } diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 7fcb866d806..1951ce834ea 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -2931,7 +2931,7 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss, ccgSubSurf_getNumFinalFaces(ss)); } - /* We absolutely need that layer, else it's no valid tesselated data! */ + /* We absolutely need that layer, else it's no valid tessellated data! */ polyidx = CustomData_add_layer(&ccgdm->dm.faceData, CD_POLYINDEX, CD_CALLOC, NULL, ccgSubSurf_getNumFinalFaces(ss)); |