diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-09 04:41:09 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-09 04:41:09 +0400 |
commit | 4f7bdc59d31e94bc97955c1efeef2a8fce0c8ecd (patch) | |
tree | 7e0a36829cf52ff260821ce02716727052b95d32 /source/blender/blenkernel | |
parent | 27d43f3fd3a6fbda95cdb87e4672fe34f19c2205 (diff) |
style cleanup: spelling.
also remove large, duplicate comments from sunsky.h
Diffstat (limited to 'source/blender/blenkernel')
22 files changed, 42 insertions, 42 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 199b2d751a8..87ba2092437 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -60,7 +60,7 @@ */ /* - * Note: This sturcture is read-only, for all practical purposes. + * Note: This structure is read-only, for all practical purposes. * At some point in the future, we may want to consider * creating a replacement structure that implements a proper * abstract mesh kernel interface. Or, we can leave this @@ -588,7 +588,7 @@ void vDM_ColorBand_store(struct ColorBand *coba); /* Simple function to get me->totvert amount of vertices/normals, * correctly deformed and subsurfered. Needed especially when vertexgroups are involved. - * In use now by vertex/weigt paint and particles */ + * In use now by vertex/weight paint and particles */ float *mesh_get_mapped_verts_nors(struct Scene *scene, struct Object *ob); /* */ diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h index 027c825663d..9e2dd778b03 100644 --- a/source/blender/blenkernel/BKE_cdderivedmesh.h +++ b/source/blender/blenkernel/BKE_cdderivedmesh.h @@ -51,7 +51,7 @@ int CDDM_Check(struct DerivedMesh *dm); /* creates a CDDerivedMesh from the given Mesh, this will reference the * original data in Mesh, but it is safe to apply vertex coordinates or - * calculate normals as those functions will automtically create new + * calculate normals as those functions will automatically create new * data to not overwrite the original */ struct DerivedMesh *CDDM_from_mesh(struct Mesh *mesh, struct Object *ob); diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index 67b8668348f..ee5e4f20af1 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -59,7 +59,7 @@ extern const CustomDataMask CD_MASK_FACECORNERS; /* for ORIGINDEX layer type, indicates no original index for this element */ #define ORIGINDEX_NONE -1 -/* initialises a CustomData object with the same layer setup as source and +/* initializes a CustomData object with the same layer setup as source and * memory space for totelem elements. mask must be an array of length * CD_NUMTYPES elements, that indicate if a layer can be copied. */ @@ -92,7 +92,7 @@ void CustomData_data_dominmax(int type, void *data, void *min, void *max); void CustomData_data_multiply(int type, void *data, float fac); void CustomData_data_add(int type, void *data1, void *data2); -/* initialises a CustomData object with the same layer setup as source. +/* initializes a CustomData object with the same layer setup as source. * mask is a bitfield where (mask & (1 << (layer type))) indicates * if a layer should be copied or not. alloctype must be one of the above. */ void CustomData_copy(const struct CustomData *source, struct CustomData *dest, diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h index 55dbca99684..173adcc295b 100644 --- a/source/blender/blenkernel/BKE_idprop.h +++ b/source/blender/blenkernel/BKE_idprop.h @@ -111,7 +111,7 @@ void IDP_ReplaceInGroup(struct IDProperty *group, struct IDProperty *prop); * (the function that adds new properties to groups, IDP_AddToGroup, returns 0 if a property can't * be added to the group, and 1 if it can) and free the property. * - * Currently the code to free ID properties is designesd to leave the actual struct + * Currently the code to free ID properties is designed to leave the actual struct * you pass it un-freed, this is needed for how the system works. This means * to free an ID property, you first call IDP_FreeProperty then MEM_freeN the * struct. In the future this will just be IDP_FreeProperty and the code will @@ -153,7 +153,7 @@ IDProperty *IDP_GroupIterNext(void *vself); /** * Frees the iterator pointed to at vself, only use this if iteration is stopped early; - * when the iterator hits the end of the list it'll automatially free itself.*/ + * when the iterator hits the end of the list it'll automatically free itself.*/ void IDP_FreeIterBeforeEnd(void *vself); /*-------- Main Functions --------*/ diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index d0e01c4fde6..cad354e451a 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -576,7 +576,7 @@ static void constraint_target_to_mat4 (Object *ob, const char *substring, float /* Current method just takes the average location of all the points in the * VertexGroup, and uses that as the location value of the targets. Where * possible, the orientation will also be calculated, by calculating an - * 'average' vertex normal, and deriving the rotaation from that. + * 'average' vertex normal, and deriving the rotation from that. * * NOTE: EditMode is not currently supported, and will most likely remain that * way as constraints can only really affect things on object/bone level. @@ -3637,7 +3637,7 @@ static void damptrack_evaluate (bConstraint *con, bConstraintOb *cob, ListBase * /* find the (unit) direction that the axis we're interested in currently points * - mul_mat3_m4_v3() only takes the 3x3 (rotation+scaling) components of the 4x4 matrix - * - the normalisation step at the end should take care of any unwanted scaling + * - the normalization step at the end should take care of any unwanted scaling * left over in the 3x3 matrix we used */ copy_v3_v3(obvec, track_dir_vecs[data->trackflag]); @@ -4398,7 +4398,7 @@ void remove_constraints_type (ListBase *list, short type, short last_only) /* ......... */ -/* Creates a new constraint, initialises its data, and returns it */ +/* Creates a new constraint, initializes its data, and returns it */ static bConstraint *add_new_constraint_internal (const char *name, short type) { bConstraint *con= MEM_callocN(sizeof(bConstraint), "Constraint"); diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index f2246da930c..6158d2f8608 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -169,7 +169,7 @@ void defvert_remap(MDeformVert *dvert, int *map, const int map_len) if (dw->def_nr < map_len) { dw->def_nr= map[dw->def_nr]; - /* just incase */ + /* just in case */ BLI_assert(dw->def_nr >= 0); } } @@ -197,7 +197,7 @@ void defvert_normalize(MDeformVert *dvert) for (i= dvert->totweight, dw= dvert->dw; i != 0; i--, dw++) { dw->weight *= scalar; - /* incase of division errors with very low weights */ + /* in case of division errors with very low weights */ CLAMP(dw->weight, 0.0f, 1.0f); } } @@ -231,14 +231,14 @@ void defvert_normalize_lock(MDeformVert *dvert, const int def_nr_lock) } if (tot_weight > 0.0f) { - /* paranoid, should be 1.0 but incase of float error clamp anyway */ + /* paranoid, should be 1.0 but in case of float error clamp anyway */ float scalar= (1.0f / tot_weight) * lock_iweight; for (i= dvert->totweight, dw= dvert->dw; i != 0; i--, dw++) { if(dw != dw_lock) { dw->weight *= scalar; - /* incase of division errors with very low weights */ + /* in case of division errors with very low weights */ CLAMP(dw->weight, 0.0f, 1.0f); } } @@ -316,7 +316,7 @@ int *defgroup_flip_map(Object *ob, int *flip_map_len, int use_default) for (dg=ob->defbase.first, i=0; dg; dg=dg->next, i++) { if (map[i] == -1) { /* may be calculated previously */ - /* incase no valid value is found, use this */ + /* in case no valid value is found, use this */ if (use_default) map[i]= i; diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index 9cd21cfd125..72890908457 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -75,7 +75,7 @@ /* Queue and stack operations for dag traversal * - * the queue store a list of freenodes to avoid successives alloc/dealloc + * the queue store a list of freenodes to avoid successive alloc/dealloc */ DagNodeQueue * queue_create (int slots) diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 5bc3b958f2e..5280215d15c 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -1235,7 +1235,7 @@ static void dynamicPaint_initAdjacencyData(DynamicPaintSurface *surface, int for if (!surface_usesAdjData(surface) && !force_init) return; if (surface->format == MOD_DPAINT_SURFACE_F_VERTEX) { - /* For vertex format, neighbours are connected by edges */ + /* For vertex format, neighbors are connected by edges */ neigh_points = 2*dm->getNumEdges(dm); } else if (surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ) @@ -3970,7 +3970,7 @@ void surface_determineForceTargetPoints(PaintSurfaceData *sData, int index, floa madd_v3_v3v3fl(force_proj, force, tangent, (-1.0f)*force_intersect); normalize_v3(force_proj); - /* get drip factor based on force dir in relation to angle between those neighbours */ + /* get drip factor based on force dir in relation to angle between those neighbors */ temp = dot_v3v3(bNeighs[closest_id[0]].dir, force_proj); CLAMP(temp, -1.0f, 1.0f); /* float precision might cause values > 1.0f that return infinite */ closest_d[1] = acosf(temp)/neigh_diff; diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index 6912eb8dbe8..ff798f5f2a1 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -136,7 +136,7 @@ static void BMEdit_RecalcTessellation_intern(BMEditMesh *tm) if ( (tm->looptris != NULL) && (tm->tottri != 0) && /* (totrti <= bm->totface * 2) would be fine for all quads, - * but incase there are some ngons, still re-use the array */ + * but in case there are some ngons, still re-use the array */ (tm->tottri <= bm->totface * 3)) { looptris = tm->looptris; diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 367a722d8c3..ee0c113d502 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -409,8 +409,8 @@ int id_single_user(bContext *C, ID *id, PointerRNA *ptr, PropertyRNA *prop) /* copy animation actions too */ BKE_copy_animdata_id_action(id); /* us is 1 by convention, but RNA_property_pointer_set - * will also incremement it, so set it to zero */ - newid->us= 0; + * will also increment it, so set it to zero */ + newid->us = 0; /* assign copy */ RNA_id_pointer_create(newid, &idptr); diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index b143e496446..f3225a6b6f5 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -1829,7 +1829,7 @@ void fill_metaball_octal_node(octal_node *node, MetaElem *ml, short i) } } -/* Node is subdivided as is ilustrated on the following figure: +/* Node is subdivided as is illustrated on the following figure: * * +------+------+ * / / /| diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 38132f1b521..9017d4b3808 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1900,7 +1900,7 @@ void convert_mfaces_to_mpolys(Mesh *mesh) int numTex, numCol; int i, j, totloop; - /* just incase some of these layers are filled in (can happen with python created meshes) */ + /* just in case some of these layers are filled in (can happen with python created meshes) */ CustomData_free(&mesh->ldata, mesh->totloop); CustomData_free(&mesh->pdata, mesh->totpoly); memset(&mesh->ldata, 0, sizeof(mesh->ldata)); diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 4ba47eb6673..2421971c53e 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -415,7 +415,7 @@ ModifierData *modifiers_getLastPreview(struct Scene *scene, ModifierData *md, in ModifierData *modifiers_getVirtualModifierList(Object *ob) { /* Kinda hacky, but should be fine since we are never - * reentrant and avoid free hassles. + * re-entrant and avoid free hassles. */ static ArmatureModifierData amd; static CurveModifierData cmd; diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index ad8b7411709..22968583d33 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -398,7 +398,7 @@ void psys_calc_dmcache(Object *ob, DerivedMesh *dm, ParticleSystem *psys) else { /* TODO PARTICLE, make the following line unnecessary, each function * should know to use the num or num_dmcache, set the num_dmcache to - * an invalid value, just incase */ + * an invalid value, just in case */ LOOP_PARTICLES pa->num_dmcache = -1; @@ -2343,7 +2343,7 @@ typedef struct SPHData { float mass; EdgeHash *eh; float *gravity; - /* Average distance to neighbours (other particles in the support domain), + /* Average distance to neighbors (other particles in the support domain), * for calculating the Courant number (adaptive time step). */ int pass; float element_size; @@ -3701,7 +3701,7 @@ static void save_hair(ParticleSimulationData *sim, float UNUSED(cfra)) /* Code for an adaptive time step based on the Courant-Friedrichs-Lewy * condition. */ #define MIN_TIMESTEP 1.0f / 101.0f -/* Tolerance of 1.5 means the last subframe neither favours growing nor +/* Tolerance of 1.5 means the last subframe neither favors growing nor * shrinking (e.g if it were 1.3, the last subframe would tend to be too * small). */ #define TIMESTEP_EXPANSION_TOLERANCE 1.5f diff --git a/source/blender/blenkernel/intern/property.c b/source/blender/blenkernel/intern/property.c index 5668907b094..baf682b4cb6 100644 --- a/source/blender/blenkernel/intern/property.c +++ b/source/blender/blenkernel/intern/property.c @@ -79,7 +79,7 @@ bProperty *copy_property(bProperty *prop) void copy_properties(ListBase *lbn, ListBase *lbo) { bProperty *prop, *propn; - free_properties( lbn ); /* incase we are copying to an object with props */ + free_properties( lbn ); /* in case we are copying to an object with props */ prop= lbo->first; while(prop) { propn= copy_property(prop); diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 3d84278c878..054520a25f4 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -250,7 +250,7 @@ void free_scene(Scene *sce) if (sce->gpd) { #if 0 // removed since this can be invalid memory when freeing everything - // since the grease pencil data is free'd before the scene. + // since the grease pencil data is freed before the scene. // since grease pencil data is not (yet?), shared between objects // its probably safe not to do this, some save and reload will free this. sce->gpd->id.us--; diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index 3d28e45f6b7..fe4316bf8d6 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -201,7 +201,7 @@ ARegion *BKE_area_region_copy(SpaceType *st, ARegion *ar) } -/* from lb2 to lb1, lb1 is supposed to be free'd */ +/* from lb2 to lb1, lb1 is supposed to be freed */ static void region_copylist(SpaceType *st, ListBase *lb1, ListBase *lb2) { ARegion *ar; diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 65a01eef175..664c9389edb 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -974,7 +974,7 @@ static void free_softbody_intern(SoftBody *sb) ** Q: why not use 'simple' collision here like bouncing back a particle ** --> reverting is velocity on the face normal ** A: because our particles are not alone here -** and need to tell their neighbours exactly what happens via spring forces +** and need to tell their neighbors exactly what happens via spring forces ** unless sbObjectStep( .. ) is called on sub frame timing level ** BTW that also questions the use of a 'implicit' solvers on softbodies ** since that would only valid for 'slow' moving collision targets and dito particles @@ -2756,7 +2756,7 @@ static void softbody_calc_forces(Scene *scene, Object *ob, float forcetime, floa /*bjornmose: uugh.. what an evil hack violation of the 'don't touch bp->pos in here' rule but works nice, like this--> - we predict the solution beeing out of the collider + we predict the solution being out of the collider in heun step No1 and leave the heun step No2 adapt to it so we kind of introduced a implicit solver for this case */ @@ -3861,11 +3861,11 @@ static void softbody_reset(Object *ob, SoftBody *sb, float (*vertexCos)[3], int /* the bp->prev*'s are for rolling back from a canceled try to propagate in time * adaptive step size algo in a nutshell: - * 1. set sheduled time step to new dtime - * 2. try to advance the sheduled time step, beeing optimistic execute it + * 1. set scheduled time step to new dtime + * 2. try to advance the scheduled time step, being optimistic execute it * 3. check for success - * 3.a we 're fine continue, may be we can increase sheduled time again ?? if so, do so! - * 3.b we did exceed error limit --> roll back, shorten the sheduled time and try again at 2. + * 3.a we 're fine continue, may be we can increase scheduled time again ?? if so, do so! + * 3.b we did exceed error limit --> roll back, shorten the scheduled time and try again at 2. * 4. check if we did reach dtime * 4.a nope we need to do some more at 2. * 4.b yup we're done diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 0aee583fcf0..58b39ea8204 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -2745,7 +2745,7 @@ static int ccgDM_use_grid_pbvh(CCGDerivedMesh *ccgdm) { MultiresModifierData *mmd= ccgdm->multires.mmd; - /* both of multires and subsurm modifiers are CCG, but + /* both of multires and subsurf modifiers are CCG, but * grids should only be used when sculpting on multires */ if(!mmd) return 0; diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 35aeb869bdd..c4f11deda0b 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -977,7 +977,7 @@ MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser *u * would be used for images * - MCLIP_USE_PROXY_CUSTOM_DIR is needed because proxy/timecode files might * be stored in a different location - * ignore all the rest pssible flags for now */ + * ignore all the rest possible flags for now */ context->clip_flag= clip->flag&MCLIP_TIMECODE_FLAGS; context->user= *user; diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index 3b84cb4eb5f..1ca7e71132a 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -590,7 +590,7 @@ int bUnit_ReplaceString(char *str, int len_max, const char *str_prev, double sca for (unit= usys->units; unit->name; unit++) { - /* incase there are multiple instances */ + /* in case there are multiple instances */ while(unit_replace(str, len_max, str_tmp, scale_pref, unit)) change= 1; } @@ -607,7 +607,7 @@ int bUnit_ReplaceString(char *str, int len_max, const char *str_prev, double sca if (usys_iter) { for (unit= usys_iter->units; unit->name; unit++) { int ofs = 0; - /* incase there are multiple instances */ + /* in case there are multiple instances */ while((ofs=unit_replace(str+ofs, len_max-ofs, str_tmp, scale_pref, unit))) change= 1; } @@ -631,7 +631,7 @@ int bUnit_ReplaceString(char *str, int len_max, const char *str_prev, double sca unit= unit_default(usys); - /* add the unit prefix and re-run, use brackets incase there was an expression given */ + /* add the unit prefix and re-run, use brackets in case there was an expression given */ if (BLI_snprintf(str_tmp, sizeof(str_tmp), "(%s)%s", str, unit->name) < sizeof(str_tmp)) { strncpy(str, str_tmp, len_max); return bUnit_ReplaceString(str, len_max, NULL, scale_pref, system, type); diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c index dbb37ad9c1d..50212522d3a 100644 --- a/source/blender/blenkernel/intern/writeavi.c +++ b/source/blender/blenkernel/intern/writeavi.c @@ -112,7 +112,7 @@ bMovieHandle *BKE_get_movie_handle(const char imtype) } #endif - /* incase all above are disabled */ + /* in case all above are disabled */ (void)imtype; return &mh; |