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 | |
| parent | 27d43f3fd3a6fbda95cdb87e4672fe34f19c2205 (diff) | |
style cleanup: spelling.
also remove large, duplicate comments from sunsky.h
Diffstat (limited to 'source/blender')
98 files changed, 170 insertions, 231 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; diff --git a/source/blender/blenlib/BLI_dlrbTree.h b/source/blender/blenlib/BLI_dlrbTree.h index e8765e699c8..7443d7a07fe 100644 --- a/source/blender/blenlib/BLI_dlrbTree.h +++ b/source/blender/blenlib/BLI_dlrbTree.h @@ -100,7 +100,7 @@ typedef void (*DLRBT_NUpdate_FP)(void *node, void *data); /* Create a new tree, and initialize as necessary */ DLRBT_Tree *BLI_dlrbTree_new(void); -/* Initialises some given trees */ +/* Initializes some given trees */ void BLI_dlrbTree_init(DLRBT_Tree *tree); /* Free some tree */ diff --git a/source/blender/blenlib/BLI_dynstr.h b/source/blender/blenlib/BLI_dynstr.h index e6a2bb45a68..f2e62d6e6bd 100644 --- a/source/blender/blenlib/BLI_dynstr.h +++ b/source/blender/blenlib/BLI_dynstr.h @@ -92,7 +92,7 @@ int BLI_dynstr_get_len (DynStr *ds); /** * Get a DynStr's contents as a c-string. - * <i> The returned c-string should be free'd + * <i> The returned c-string should be freed * using MEM_freeN. </i> * * \param ds The DynStr of interest. diff --git a/source/blender/blenlib/BLI_scanfill.h b/source/blender/blenlib/BLI_scanfill.h index 9589ee6e305..1fe71bffba8 100644 --- a/source/blender/blenlib/BLI_scanfill.h +++ b/source/blender/blenlib/BLI_scanfill.h @@ -82,7 +82,7 @@ struct ScanFillVert *BLI_addfillvert(const float vec[3]); struct ScanFillEdge *BLI_addfilledge(struct ScanFillVert *v1, struct ScanFillVert *v2); /* Optionally set ScanFillEdge f to this to mark original boundary edges. - * Only needed if there are internal diagonal edges pased to BLI_edgefill. */ + * Only needed if there are internal diagonal edges passed to BLI_edgefill. */ #define FILLBOUNDARY 1 int BLI_begin_edgefill(void); diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index 561c7ffb57e..b992d518b49 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -718,7 +718,7 @@ static void split_leafs(BVHNode **leafs_array, int *nth, int partitions, int spl * * This function creates an implicit tree on branches_array, the leafs are given on the leafs_array. * - * The tree is built per depth levels. First branchs at depth 1.. then branches at depth 2.. etc.. + * The tree is built per depth levels. First branches at depth 1.. then branches at depth 2.. etc.. * The reason is that we can build level N+1 from level N without any data dependencies.. thus it allows * to use multithread building. * diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c index 2fd1a506004..74c7b67beed 100644 --- a/source/blender/blenlib/intern/math_base_inline.c +++ b/source/blender/blenlib/intern/math_base_inline.c @@ -102,7 +102,7 @@ MINLINE float interpf(float target, float origin, float fac) /* useful to calculate an even width shell, by taking the angle between 2 planes. * The return value is a scale on the offset. - * no angle between planes is 1.0, as the angle between the 2 planes approches 180d + * no angle between planes is 1.0, as the angle between the 2 planes approaches 180d * the distance gets very high, 180d would be inf, but this case isn't valid */ MINLINE float shell_angle_to_dist(const float angle) { diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 2918461540d..8217439b7be 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -2585,7 +2585,7 @@ void vcloud_estimate_transform(int list_size, float (*pos)[3], float *weight,flo m[2][1] += va[2] * vb[1]; m[2][2] += va[2] * vb[2]; - /* building the referenc matrix on the fly + /* building the reference matrix on the fly * needed to scale properly later */ mr[0][0] += va[0] * va[0]; diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c index d728f49c3cd..4e85d033cf7 100644 --- a/source/blender/blenlib/intern/math_rotation.c +++ b/source/blender/blenlib/intern/math_rotation.c @@ -706,7 +706,7 @@ void eulO_to_axis_angle(float axis[3], float *angle, const float eul[3], const s quat_to_axis_angle(axis, angle,q); } -/* axis angle to 3x3 matrix - safer version (normalisation of axis performed) */ +/* axis angle to 3x3 matrix - safer version (normalization of axis performed) */ void axis_angle_to_mat3(float mat[3][3], const float axis[3], const float angle) { float nor[3], nsi[3], co, si, ico; @@ -737,7 +737,7 @@ void axis_angle_to_mat3(float mat[3][3], const float axis[3], const float angle) mat[2][2] = ((nor[2] * nor[2]) * ico) + co; } -/* axis angle to 4x4 matrix - safer version (normalisation of axis performed) */ +/* axis angle to 4x4 matrix - safer version (normalization of axis performed) */ void axis_angle_to_mat4(float mat[4][4], const float axis[3], const float angle) { float tmat[3][3]; diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index f2c11f46cd6..a512ac746f9 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -746,7 +746,7 @@ int BLI_path_cwd(char *path) if (wasrelative==1) { char cwd[FILE_MAX]= ""; - BLI_current_working_dir(cwd, sizeof(cwd)); /* incase the full path to the blend isnt used */ + BLI_current_working_dir(cwd, sizeof(cwd)); /* in case the full path to the blend isnt used */ if (cwd[0] == '\0') { printf( "Could not get the current working directory - $PWD for an unknown reason."); @@ -1151,7 +1151,7 @@ char *BLI_get_folder_version(const int id, const int ver, const int do_check) ok= get_path_system(path, NULL, NULL, NULL, ver); break; default: - path[0]= '\0'; /* incase do_check is false */ + path[0]= '\0'; /* in case do_check is false */ ok= FALSE; BLI_assert(!"incorrect ID"); } diff --git a/source/blender/blenlib/intern/string_cursor_utf8.c b/source/blender/blenlib/intern/string_cursor_utf8.c index 7fdeaf35514..08440b0e12b 100644 --- a/source/blender/blenlib/intern/string_cursor_utf8.c +++ b/source/blender/blenlib/intern/string_cursor_utf8.c @@ -157,7 +157,7 @@ void BLI_str_cursor_step_utf8(const char *str, size_t maxlen, if ((jump != STRCUR_JUMP_ALL) && (is_special != test_special_char(str[(*pos)]))) break; } else { - break; /* unlikely but just incase */ + break; /* unlikely but just in case */ } } } diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 5509fc3dd85..c16b0003d9b 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -952,7 +952,7 @@ static FileData *filedata_new(void) fd->gzfiledes = NULL; /* XXX, this doesn't need to be done all the time, - * but it keeps us reentrant, remove once we have + * but it keeps us re-entrant, remove once we have * a lib that provides a nice lock. - zr */ fd->memsdna = DNA_sdna_from_data(DNAstr, DNAlen, 0); @@ -4257,7 +4257,7 @@ static void direct_link_pose(FileData *fd, bPose *pose) pchan->iktree.first= pchan->iktree.last= NULL; pchan->siktree.first= pchan->siktree.last= NULL; - /* incase this value changes in future, clamp else we get undefined behavior */ + /* in case this value changes in future, clamp else we get undefined behavior */ CLAMP(pchan->rotmode, ROT_MODE_MIN, ROT_MODE_MAX); } pose->ikdata = NULL; @@ -4711,7 +4711,7 @@ static void direct_link_object(FileData *fd, Object *ob) /* Do conversion here because if we have loaded * a hook we need to make sure it gets converted - * and free'd, regardless of version. + * and freed, regardless of version. */ copy_v3_v3(hmd->cent, hook->cent); hmd->falloff = hook->falloff; @@ -4736,7 +4736,7 @@ static void direct_link_object(FileData *fd, Object *ob) ob->gpulamp.first= ob->gpulamp.last= NULL; link_list(fd, &ob->pc_ids); - /* incase this value changes in future, clamp else we get undefined behavior */ + /* in case this value changes in future, clamp else we get undefined behavior */ CLAMP(ob->rotmode, ROT_MODE_MIN, ROT_MODE_MAX); if(ob->sculpt) { diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 10e142f08bb..42c0ed1e55d 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -2895,7 +2895,7 @@ int BLO_write_file(Main *mainvar, const char *filepath, int write_flags, ReportL BLI_split_dir_part(filepath, dir1, sizeof(dir1)); BLI_split_dir_part(mainvar->name, dir2, sizeof(dir2)); - /* just incase there is some subtle difference */ + /* just in case there is some subtle difference */ BLI_cleanup_dir(mainvar->name, dir1); BLI_cleanup_dir(mainvar->name, dir2); diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 9a7524ba73b..f58c1141561 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -667,7 +667,7 @@ BMesh *BM_mesh_copy(BMesh *bm_old) f2 = BM_face_create_ngon(bm_new, v, v2, edges, f->len, FALSE); if (!f2) continue; - /* use totface incase adding some faces fails */ + /* use totface in case adding some faces fails */ BM_elem_index_set(f2, (bm_new->totface - 1)); /* set_inline */ ftable[i] = f2; diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index deed825aa0a..72f6814dc89 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -581,7 +581,7 @@ BMEdge *BM_vert_collapse_edge(BMesh *bm, BMEdge *ke, BMVert *kv, /* Collapse between 2 edges */ /* in this case we want to keep all faces and not join them, - * rather just get rid of the veretex - see bug [#28645] */ + * rather just get rid of the vertex - see bug [#28645] */ BMVert *tv = bmesh_edge_other_vert_get(ke, kv); if (tv) { BMEdge *e2 = bmesh_disk_edge_next(ke, kv); @@ -1073,7 +1073,7 @@ BMEdge *BM_edge_rotate(BMesh *bm, BMEdge *e, const short ccw, const short check_ /** * \brief Rip a single face from a vertex fan */ -BMVert *BM_face_vert_rip(BMesh *bm, BMFace *sf, BMVert *sv) +BMVert *BM_face_vert_separate(BMesh *bm, BMFace *sf, BMVert *sv) { return bmesh_urmv(bm, sf, sv); } @@ -1081,9 +1081,9 @@ BMVert *BM_face_vert_rip(BMesh *bm, BMFace *sf, BMVert *sv) /** * \brief Rip a single face from a vertex fan * - * \note same as #BM_face_vert_rip but faster (avoids a loop lookup) + * \note same as #BM_face_vert_separate but faster (avoids a loop lookup) */ -BMVert *BM_face_loop_rip(BMesh *bm, BMLoop *sl) +BMVert *BM_face_loop_separate(BMesh *bm, BMLoop *sl) { return bmesh_urmv_loop(bm, sl); } diff --git a/source/blender/bmesh/intern/bmesh_mods.h b/source/blender/bmesh/intern/bmesh_mods.h index 994456f5917..f87cdcc02e2 100644 --- a/source/blender/bmesh/intern/bmesh_mods.h +++ b/source/blender/bmesh/intern/bmesh_mods.h @@ -77,7 +77,7 @@ enum { }; -BMVert *BM_face_vert_rip(BMesh *bm, BMFace *sf, BMVert *sv); -BMVert *BM_face_loop_rip(BMesh *bm, BMLoop *sl); +BMVert *BM_face_vert_separate(BMesh *bm, BMFace *sf, BMVert *sv); +BMVert *BM_face_loop_separate(BMesh *bm, BMLoop *sl); #endif /* __BMESH_MODS_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 69e85fda002..97990c614d5 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -75,7 +75,7 @@ * """ * * so the first line is the "title" of the bmop. - * subsequent line blocks seperated by blank lines + * subsequent line blocks separated by blank lines * are paragraphs. individual descriptions of slots * would be extracted from comments * next to them, e.g. diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index a3c791a6af9..49a4df0fc9c 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -28,7 +28,7 @@ * tessellation, etc) * * BMESH_TODO: - * - Add in Tesselator frontend that creates + * - Add in Tessellator frontend that creates * BMTriangles from copied faces * * - Add in Function that checks for and flags @@ -47,7 +47,7 @@ * \brief TEST EDGE SIDE and POINT IN TRIANGLE * * Point in triangle tests stolen from scanfill.c. - * Used for tesselator + * Used for tessellator */ static short testedgesidef(const float v1[2], const float v2[2], const float v3[2]) @@ -700,12 +700,11 @@ static int goodline(float (*projectverts)[3], BMFace *f, int v1i, /** * \brief Find Ear * - * Used by tesselator to find + * Used by tessellator to find * the next triangle to 'clip off' * of a polygon while tessellating. * * \param use_beauty Currently only applies to quads, can be extended later on. - * */ static BMLoop *find_ear(BMesh *UNUSED(bm), BMFace *f, float (*verts)[3], const int nvert, const int use_beauty) { diff --git a/source/blender/bmesh/operators/bmo_bevel.c b/source/blender/bmesh/operators/bmo_bevel.c index e055cd2306e..e881e1e277a 100644 --- a/source/blender/bmesh/operators/bmo_bevel.c +++ b/source/blender/bmesh/operators/bmo_bevel.c @@ -552,7 +552,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. - * leave this in incase we need to use it later */ + * leave this in in case we need to use it later */ #if 0 float ang; #endif diff --git a/source/blender/bmesh/operators/bmo_extrude.c b/source/blender/bmesh/operators/bmo_extrude.c index d62a22bcb8f..595502586b9 100644 --- a/source/blender/bmesh/operators/bmo_extrude.c +++ b/source/blender/bmesh/operators/bmo_extrude.c @@ -495,7 +495,7 @@ static void calc_solidify_normals(BMesh *bm) } else { /* can't do anything useful here! - * Set the face index for a vert incase it gets a zero normal */ + * Set the face index for a vert in case it gets a zero normal */ BM_elem_flag_disable(e->v1, BM_ELEM_TAG); BM_elem_flag_disable(e->v2, BM_ELEM_TAG); continue; diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c index 1f83a54e8f3..16c1289f5fa 100644 --- a/source/blender/bmesh/operators/bmo_mesh_conv.c +++ b/source/blender/bmesh/operators/bmo_mesh_conv.c @@ -273,7 +273,7 @@ void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op) BM_elem_index_set(l, mpoly->loopstart + j); /* set_loop */ } - /* Copy Custom Dat */ + /* Copy Custom Data */ CustomData_to_bmesh_block(&me->pdata, &bm->pdata, i, &f->head.data); } diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index 2067de22467..9ce148bc083 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -574,7 +574,7 @@ short copy_animedit_keys (bAnimContext *ac, ListBase *anim_data) if (ELEM(NULL, animcopybuf.first, animcopybuf.last)) return -1; - /* incase 'relative' paste method is used */ + /* in case 'relative' paste method is used */ animcopy_cfra= CFRA; /* everything went fine */ diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 3c5de538fdc..2a9436fdb41 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -284,7 +284,7 @@ EditBone *make_boneList(ListBase *edbo, ListBase *bones, EditBone *parent, Bone eBone->flag &= ~BONE_ROOTSEL; } - /* probably not selected but just incase */ + /* probably not selected but just in case */ eBone->flag &= ~BONE_TIPSEL; } } diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 56f20a14d13..aa8dad08ac2 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -2227,7 +2227,7 @@ static int smooth_radius_exec(bContext *C, wmOperator *UNUSED(op)) break; } } - /* incase there are no other selected verts */ + /* in case there are no other selected verts */ end_sel = start_sel; for(bezt=nu->bezt+(start_sel+1), a=start_sel+1; a<nu->pntsu; a++, bezt++) { if((bezt->f2 & SELECT)==0) { @@ -2289,7 +2289,7 @@ static int smooth_radius_exec(bContext *C, wmOperator *UNUSED(op)) break; } } - /* incase there are no other selected verts */ + /* in case there are no other selected verts */ end_sel = start_sel; for(bp=nu->bp+(start_sel+1), a=start_sel+1; a<nu->pntsu; a++, bp++) { if((bp->f1 & SELECT)==0) { @@ -5160,7 +5160,7 @@ void CURVE_OT_select_more(wmOperatorType *ot) /******************** select less operator *****************/ -/* basic method: deselect if control point doesn't have all neighbours selected */ +/* basic method: deselect if control point doesn't have all neighbors selected */ static int select_less_exec(bContext *C, wmOperator *UNUSED(op)) { Object *obedit= CTX_data_edit_object(C); @@ -5181,7 +5181,7 @@ static int select_less_exec(bContext *C, wmOperator *UNUSED(op)) if((bp->hide==0) && (bp->f1 & SELECT)) { sel= 0; - /* check if neighbours have been selected */ + /* check if neighbors have been selected */ /* edges of surface are an exception */ if((a+1)%nu->pntsu==0) sel++; else { @@ -5236,7 +5236,7 @@ static int select_less_exec(bContext *C, wmOperator *UNUSED(op)) if(lastsel==1) sel= 1; else sel= 0; - /* check if neighbours have been selected */ + /* check if neighbors have been selected */ /* first and last are exceptions */ if(a==nu->pntsu-1) sel++; else { diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 1cf93ba8b11..01700e1c52a 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 incase the colorband isnt valid */ + float pos, colf[4]= {0,0,0,0}; /* initialize in case the colorband isnt valid */ coba= (ColorBand *)(but->editcoba? but->editcoba: but->poin); if(coba==NULL) return; diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index aa2d939d5f1..f868cd86db7 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1944,7 +1944,7 @@ void uiTemplateColorWheel(uiLayout *layout, PointerRNA *ptr, const char *propnam } if(lock_luminosity) { - float color[4]; /* incase of alpha */ + float color[4]; /* in case of alpha */ but->flag |= UI_BUT_VEC_SIZE_LOCK; RNA_property_float_get_array(ptr, prop, color); but->a2= len_v3(color); @@ -2246,11 +2246,11 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe * integer = IntProperty() * string = StringProperty() * - * # A string of all identifiers (colon-separated) which property’s controls should be + * # A string of all identifiers (colon-separated) which property's controls should be * # displayed in a template_list. * template_list_controls = StringProperty(default="integer:bool:string", options={"HIDDEN"}) * - * … you’ll get a numfield for the integer prop, a check box for the bool prop, and a textfield + * ... you'll get a numfield for the integer prop, a check box for the bool prop, and a textfield * for the string prop, after the name of each item of the collection. */ else if (prop_list_id) { @@ -2259,9 +2259,9 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe /* XXX: Check, as sometimes we get an itemptr looking like * {id = {data = 0x0}, type = 0x0, data = 0x0} - * which would obviously produce a sigsev… */ + * which would obviously produce a sigsev... */ if (itemptr->type) { - /* If the special property is set for the item, and it is a collection… */ + /* If the special property is set for the item, and it is a collection... */ PropertyRNA *prop_list= RNA_struct_find_property(itemptr, prop_list_id); if(prop_list && RNA_property_type(prop_list) == PROP_STRING) { diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 3dadd69c9f4..8dd17888e22 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1206,7 +1206,7 @@ void init_userdef_do_versions(void) U.pad_rot_angle= 15; /* signal for derivedmesh to use colorband */ - /* run incase this was on and is now off in the user prefs [#28096] */ + /* run in case this was on and is now off in the user prefs [#28096] */ vDM_ColorBand_store((U.flag & USER_CUSTOM_RANGE) ? (&U.coba_weight):NULL); if (bmain->versionfile <= 191) { diff --git a/source/blender/editors/mesh/bmesh_select.c b/source/blender/editors/mesh/bmesh_select.c index 3085a293143..2c5e8439b57 100644 --- a/source/blender/editors/mesh/bmesh_select.c +++ b/source/blender/editors/mesh/bmesh_select.c @@ -1262,7 +1262,7 @@ static int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, B /* * Arrays are now filled as follows: * - * nedges[n] = sum of the # of edges incident to all vertices numbered 0 thru n - 1 + * nedges[n] = sum of the # of edges incident to all vertices numbered 0 through n - 1 * edges[edges[n]..edges[n - 1]] = the indices of of the edges incident to vertex n * * As the search continues, prevedge[n] will be the previous edge on the shortest diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c index 41eb85007f2..924e1fbf339 100644 --- a/source/blender/editors/mesh/bmesh_tools.c +++ b/source/blender/editors/mesh/bmesh_tools.c @@ -2409,7 +2409,7 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) /* rip two adjacent edges */ if (BM_edge_face_count(e2) == 1 || BM_vert_face_count(v) == 2) { l = e2->l; - ripvert = BM_face_vert_rip(bm, l->f, v); + ripvert = BM_face_vert_separate(bm, l->f, v); BLI_assert(ripvert); if (!ripvert) { diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 0c12d701616..996dd4ca59f 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1143,7 +1143,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base, * still work out ok */ object_apply_mat4(ob_dst, dob->mat, FALSE, TRUE); - /* to set ob_dst->orig and incase theres any other discrepicies */ + /* to set ob_dst->orig and in case theres any other discrepicies */ DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB); } } diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index f1fbf27312a..b3629abc4e6 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -1384,7 +1384,7 @@ static void bake_update(void *bkv) { BakeRender *bkr= bkv; - if(bkr->sa && bkr->sa->spacetype==SPACE_IMAGE) { /* incase the user changed while baking */ + if(bkr->sa && bkr->sa->spacetype==SPACE_IMAGE) { /* in case the user changed while baking */ SpaceImage *sima= bkr->sa->spacedata.first; if(sima) sima->image= RE_bake_shade_get_image(); diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 385eb1be656..e456e6f0796 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -741,7 +741,7 @@ static void copy_texture_space(Object *to, Object *ob) } -/* UNUSED, keep incase we want to copy functionality for use elsewhere */ +/* UNUSED, keep in case we want to copy functionality for use elsewhere */ static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event) { Object *ob; diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 34396bf7fa4..6a144ad748b 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -715,7 +715,7 @@ static void vgroup_normalize(Object *ob) for(i = 0; i < dvert_tot; i++) { - /* incase its not selected */ + /* in case its not selected */ if (!(dv = dvert_array[i])) { continue; } @@ -729,7 +729,7 @@ static void vgroup_normalize(Object *ob) if(weight_max > 0.0f) { for(i = 0; i < dvert_tot; i++) { - /* incase its not selected */ + /* in case its not selected */ if (!(dv = dvert_array[i])) { continue; } @@ -738,7 +738,7 @@ static void vgroup_normalize(Object *ob) if(dw) { dw->weight /= weight_max; - /* incase of division errors with very low weights */ + /* in case of division errors with very low weights */ CLAMP(dw->weight, 0.0f, 1.0f); } } @@ -1113,7 +1113,7 @@ static void vgroup_levels(Object *ob, float offset, float gain) if (dvert_array) { for(i = 0; i < dvert_tot; i++) { - /* incase its not selected */ + /* in case its not selected */ if (!(dv = dvert_array[i])) { continue; } @@ -1149,7 +1149,7 @@ static void vgroup_normalize_all(Object *ob, int lock_active) if(lock_active) { for(i = 0; i < dvert_tot; i++) { - /* incase its not selected */ + /* in case its not selected */ if (!(dv = dvert_array[i])) { continue; } @@ -1160,7 +1160,7 @@ static void vgroup_normalize_all(Object *ob, int lock_active) else { for(i = 0; i < dvert_tot; i++) { - /* incase its not selected */ + /* in case its not selected */ if (!(dv = dvert_array[i])) { continue; } @@ -1220,7 +1220,7 @@ static void vgroup_invert(Object *ob, const short auto_assign, const short auto_ if (dvert_array) { for(i = 0; i < dvert_tot; i++) { - /* incase its not selected */ + /* in case its not selected */ if (!(dv = dvert_array[i])) { continue; } @@ -1324,7 +1324,7 @@ static void vgroup_blend(Object *ob) dw= defvert_verify_index(dvert, def_nr); dw->weight= vg_weights[i] / (float)vg_users[i]; - /* incase of division errors */ + /* in case of division errors */ CLAMP(dw->weight, 0.0f, 1.0f); } @@ -1353,7 +1353,7 @@ static void vgroup_clean(Object *ob, const float epsilon, int keep_single) /* only the active group */ for(i = 0; i < dvert_tot; i++) { - /* incase its not selected */ + /* in case its not selected */ if (!(dv = dvert_array[i])) { continue; } @@ -1388,7 +1388,7 @@ static void vgroup_clean_all(Object *ob, const float epsilon, const int keep_sin for(i = 0; i < dvert_tot; i++) { int j; - /* incase its not selected */ + /* in case its not selected */ if (!(dv = dvert_array[i])) { continue; } diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 74b0c40b6fd..79832e2a9d1 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -334,7 +334,7 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op) oglrender->scene->customdata_mask_modal = (ED_view3d_datamask(oglrender->scene, oglrender->v3d) | ED_view3d_object_datamask(oglrender->scene) ); - /* apply immediately incase we're rendering from a script, + /* apply immediately in case we're rendering from a script, * running notifiers again will overwrite */ oglrender->scene->customdata_mask |= oglrender->scene->customdata_mask_modal; diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 32dda420aec..f8a9516c97e 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -2714,7 +2714,7 @@ static void project_paint_bucket_bounds(const ProjPaintState *ps, const float mi bucketMax[0] = (int)((int)(((float)(max[0] - ps->screenMin[0]) / ps->screen_width) * ps->buckets_x) + 1.5f); bucketMax[1] = (int)((int)(((float)(max[1] - ps->screenMin[1]) / ps->screen_height) * ps->buckets_y) + 1.5f); - /* incase the rect is outside the mesh 2d bounds */ + /* in case the rect is outside the mesh 2d bounds */ CLAMP(bucketMin[0], 0, ps->buckets_x); CLAMP(bucketMin[1], 0, ps->buckets_y); diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index b5059d157b9..f0baa6acf8c 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -1011,7 +1011,7 @@ void filelist_from_library(struct FileList* filelist) idcode= groupname_to_code(group); /* memory for strings is passed into filelist[i].relname - * and free'd in freefilelist */ + * and freed in freefilelist */ if (idcode) { previews= BLO_blendhandle_get_previews(filelist->libfiledata, idcode, &nprevs); names= BLO_blendhandle_get_datablock_names(filelist->libfiledata, idcode, &nnames); diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 6742852cbf4..ae47125fa84 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1059,7 +1059,7 @@ static int save_image_options_init(SaveImageOptions *simopts, SpaceImage *sima, /* sanitize all settings */ - /* unlikely but just incase */ + /* unlikely but just in case */ if (ELEM3(simopts->im_format.planes, R_IMF_PLANES_BW, R_IMF_PLANES_RGB, R_IMF_PLANES_RGBA) == 0) { simopts->im_format.planes= R_IMF_PLANES_RGBA; } @@ -1229,7 +1229,7 @@ static int image_save_as_exec(bContext *C, wmOperator *op) save_image_options_defaults(&simopts); - /* just incase to initialize values, + /* just in case to initialize values, * these should be set on invoke or by the caller. */ save_image_options_init(&simopts, sima, CTX_data_scene(C), 0); diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 7fdd2e73181..b44e363090f 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -391,7 +391,7 @@ static void group_linkobs2scene_cb(bContext *UNUSED(C), Scene *scene, TreeElemen gob->ob->flag |= SELECT; base->flag = gob->ob->flag; base->object= gob->ob; - id_lib_extern((ID *)gob->ob); /* incase these are from a linked group */ + id_lib_extern((ID *)gob->ob); /* in case these are from a linked group */ } } } diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index e50d1ae6fc9..1bbf4b670b5 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -830,7 +830,7 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq } break; case SEQ_DRAW_IMG_WAVEFORM: - if ((sseq->flag & SEQ_DRAW_COLOR_SEPERATED) != 0) { + if ((sseq->flag & SEQ_DRAW_COLOR_SEPARATED) != 0) { scope = make_sep_waveform_view_from_ibuf(ibuf); } else { scope = make_waveform_view_from_ibuf(ibuf); diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index dd3d0c05beb..54dff3e4786 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -1980,7 +1980,7 @@ static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base, unsigned char col[4]; float col_f[4]; - glGetFloatv(GL_CURRENT_COLOR, col_f); /* incase this is not set below */ + glGetFloatv(GL_CURRENT_COLOR, col_f); /* in case this is not set below */ rgb_float_to_uchar(col, col_f); col[3]= 255; diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 32f2d1bab9f..651b0edb123 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -826,7 +826,7 @@ void draw_mesh_textured_old(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec /* reset from negative scale correction */ glFrontFace(GL_CCW); - /* in editmode, the blend mode needs to be set incase it was ADD */ + /* in editmode, the blend mode needs to be set in case it was ADD */ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); } diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index a9533b57d8f..7bf5d29574a 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1076,7 +1076,7 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d) * 0.0001 on the lower left the 2D border sometimes * obscures the 3D camera border */ /* note: with VIEW3D_CAMERA_BORDER_HACK defined this error isn't noticeable - * but keep it here incase we need to remove the workaround */ + * but keep it here in case we need to remove the workaround */ x1i= (int)(x1 - 1.0001f); y1i= (int)(y1 - 1.0001f); x2i= (int)(x2 + (1.0f-0.0001f)); diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 3218daf65c7..89794706181 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -196,8 +196,8 @@ typedef struct FlyInfo { /* backup values */ float dist_backup; /* backup the views distance since we use a zero dist for fly mode */ - float ofs_backup[3]; /* backup the views offset incase the user cancels flying in non camera mode */ - float rot_backup[4]; /* backup the views quat incase the user cancels flying in non camera mode. + float ofs_backup[3]; /* backup the views offset in case the user cancels flying in non camera mode */ + float rot_backup[4]; /* backup the views quat in case the user cancels flying in non camera mode. * (quat for view, eul for camera) */ short persp_backup; /* remember if were ortho or not, only used for restoring the view if it was a ortho view */ diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 64c4cacb8b6..666d0a2f7f2 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1715,7 +1715,7 @@ int initTransform(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event, int /* overwrite initial values if operator supplied a non-null vector */ if ( (prop = RNA_struct_find_property(op->ptr, "value")) && RNA_property_is_set(op->ptr, prop)) { - float values[4]= {0}; /* incase value isn't length 4, avoid uninitialized memory */ + float values[4]= {0}; /* in case value isn't length 4, avoid uninitialized memory */ if(RNA_property_array_check(prop)) { RNA_float_get_array(op->ptr, "value", values); diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 9010ce0c18e..48c05f00ea8 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -148,7 +148,7 @@ typedef struct TransData2D { float ih1[2], ih2[2]; } TransData2D; -/* we need to store 2 handles for each transdata incase the other handle wasnt selected */ +/* we need to store 2 handles for each transdata in case the other handle wasnt selected */ typedef struct TransDataCurveHandleFlags { char ih1, ih2; char *h1, *h2; diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index be2382fd11c..146c8e5cc00 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -1421,7 +1421,7 @@ static TransDataCurveHandleFlags *initTransDataCurveHandles(TransData *td, struc hdata = td->hdata = MEM_mallocN(sizeof(TransDataCurveHandleFlags), "CuHandle Data"); hdata->ih1 = bezt->h1; hdata->h1 = &bezt->h1; - hdata->ih2 = bezt->h2; /* incase the second is not selected */ + hdata->ih2 = bezt->h2; /* in case the second is not selected */ hdata->h2 = &bezt->h2; return hdata; } diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index f59b075525e..d24081ae472 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -512,7 +512,7 @@ static void recalcData_nla(TransInfo *t) if ((pExceeded && nExceeded) || (iter == 4) ) { /* both endpoints exceeded (or iteration ping-pong'd meaning that we need a compromise) * - simply crop strip to fit within the bounds of the strips bounding it - * - if there were no neighbours, clear the transforms (make it default to the strip's current values) + * - if there were no neighbors, clear the transforms (make it default to the strip's current values) */ if (strip->prev && strip->next) { tdn->h1[0]= strip->prev->end; diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 57d3344895c..770b8fc0adf 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -257,7 +257,7 @@ GPUBuffer *GPU_buffer_alloc(int size) } /* release a GPUBuffer; does not free the actual buffer or its data, - but rather moves it to the pool of recently-free'd buffers for + but rather moves it to the pool of recently-freed buffers for possible re-use*/ void GPU_buffer_free(GPUBuffer *buffer) { diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h index 195cab6b94e..1e0cdf10dba 100644 --- a/source/blender/imbuf/IMB_imbuf.h +++ b/source/blender/imbuf/IMB_imbuf.h @@ -63,7 +63,7 @@ * management. * - \ref blenlib module * blenlib handles guarded memory management in blender-style. - * BLI_winstuff.h makes a few windows specific behaviours + * BLI_winstuff.h makes a few windows specific behaviors * posix-compliant. */ diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c index e823843e3cf..ca30628c62f 100644 --- a/source/blender/imbuf/intern/jpeg.c +++ b/source/blender/imbuf/intern/jpeg.c @@ -405,7 +405,7 @@ static ImBuf * ibJpegImageFromCinfo(struct jpeg_decompress_struct * cinfo, int f /* * A little paranoid, but the file maybe * is broken... and a "extra" check is better - * that a segfaul ;) + * then segfault ;) */ if (!key) { MEM_freeN(str); diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c index 808bcbed751..f863fe8de21 100644 --- a/source/blender/imbuf/intern/thumbs.c +++ b/source/blender/imbuf/intern/thumbs.c @@ -251,8 +251,8 @@ ImBuf* IMB_thumb_create(const char* path, ThumbSize size, ThumbSource source, Im char tpath[FILE_MAX]; char tdir[FILE_MAX]; char temp[FILE_MAX]; - char mtime[40]= "0"; /* incase we can't stat the file */ - char cwidth[40]= "0"; /* incase images have no data */ + char mtime[40]= "0"; /* in case we can't stat the file */ + char cwidth[40]= "0"; /* in case images have no data */ char cheight[40]= "0"; char thumb[40]; short tsize = 128; diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index bcdeff6cf1b..7b633523ef8 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -866,7 +866,7 @@ enum { /* sseq->flag */ #define SEQ_DRAWFRAMES 1 #define SEQ_MARKER_TRANS 2 -#define SEQ_DRAW_COLOR_SEPERATED 4 +#define SEQ_DRAW_COLOR_SEPARATED 4 #define SEQ_DRAW_SAFE_MARGINS 8 #define SEQ_DRAW_GPENCIL 16 #define SEQ_NO_DRAW_CFRANUM 32 diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 8f0184fcce7..418d4e31819 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -1866,7 +1866,7 @@ static const char *rna_property_subtypename(PropertySubType type) case PROP_LAYER: return "PROP_LAYER"; case PROP_LAYER_MEMBER: return "PROP_LAYER_MEMBER"; default: { - /* incase we dont have a type preset that includes the subtype */ + /* in case we dont 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_access.c b/source/blender/makesrna/intern/rna_access.c index 0a420b1c6bf..bf9a21a87c6 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -213,7 +213,7 @@ void RNA_pointer_recast(PointerRNA *ptr, PointerRNA *r_ptr) { StructRNA *base; PointerRNA t_ptr; - *r_ptr = *ptr; /* initialize as the same incase cant recast */ + *r_ptr = *ptr; /* initialize as the same in case cant recast */ for (base = ptr->type->base; base; base = base->base) { t_ptr = rna_pointer_inherit_refine(ptr, base, ptr->data); @@ -1624,7 +1624,7 @@ void RNA_property_boolean_set(PointerRNA *ptr, PropertyRNA *prop, int value) BLI_assert(RNA_property_type(prop) == PROP_BOOLEAN); BLI_assert(RNA_property_array_check(prop) == 0); - /* just incase other values are passed */ + /* just in case other values are passed */ if (value) value = 1; if ((idprop = rna_idproperty_check(&prop, ptr))) { diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index 6a9228dc8aa..f6a20b4edb4 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -338,7 +338,7 @@ PointerRNA rna_listbase_lookup_int(PointerRNA *ptr, StructRNA *type, struct List typedef struct ArrayIterator { char *ptr; char *endptr; /* past the last valid pointer, only for comparisons, ignores skipped values */ - void *free_ptr; /* will be free'd if set */ + void *free_ptr; /* will be freed if set */ int itemsize; /* array length with no skip functins applied, take care not to compare against index from animsys or python indices */ diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index e0334c9f762..a406e4fb934 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -362,7 +362,7 @@ static void rna_Scene_object_unlink(Scene *scene, ReportList *reports, Object *o ob->id.us--; - /* needed otherwise the depgraph will contain free'd objects which can crash, see [#20958] */ + /* needed otherwise the depgraph will contain freed objects which can crash, see [#20958] */ DAG_scene_sort(G.main, scene); DAG_ids_flush_update(G.main, 0); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 70ed4ffbb0f..779a5720645 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1996,7 +1996,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL); prop = RNA_def_property(srna, "show_separate_color", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_DRAW_COLOR_SEPERATED); + RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_DRAW_COLOR_SEPARATED); RNA_def_property_ui_text(prop, "Separate Colors", "Separate color channels in preview"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL); diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index a9c154fa43e..7258e6353da 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -429,7 +429,7 @@ static StructRNA *rna_Menu_register(Main *bmain, ReportList *reports, void *data dummymenu.type->description = _menu_descr; RNA_pointer_create(NULL, &RNA_Menu, &dummymenu, &dummymtr); - /* clear incase they are left unset */ + /* clear in case they are left unset */ _menu_descr[0] = '\0'; /* validate the python class */ diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 5e76c07cb60..cd9eec5abb6 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -1006,7 +1006,7 @@ static StructRNA *rna_Operator_register(Main *bmain, ReportList *reports, void * dummyot.description = _operator_descr; /* only assigne the pointer, string is NULL'd */ RNA_pointer_create(NULL, &RNA_Operator, &dummyop, &dummyotr); - /* clear incase they are left unset */ + /* clear in case they are left unset */ _operator_idname[0] = _operator_name[0] = _operator_descr[0] = '\0'; /* validate the python class */ diff --git a/source/blender/nodes/shader/node_shader_util.c b/source/blender/nodes/shader/node_shader_util.c index 1a9a0fc4b3e..6e79c4acbeb 100644 --- a/source/blender/nodes/shader/node_shader_util.c +++ b/source/blender/nodes/shader/node_shader_util.c @@ -210,7 +210,7 @@ void node_gpu_stack_from_data(struct GPUNodeStack *gs, int type, bNodeStack *ns) gs->name = ""; gs->hasinput= ns->hasinput && ns->data; - /* XXX Commented out the ns->data check here, as it seems it’s not alwas set, + /* XXX Commented out the ns->data check here, as it seems it's not alwas set, * even though there *is* a valid connection/output... But that might need * further investigation. */ diff --git a/source/blender/python/bmesh/bmesh_py_types.h b/source/blender/python/bmesh/bmesh_py_types.h index f496527768d..fab5a52f98e 100644 --- a/source/blender/python/bmesh/bmesh_py_types.h +++ b/source/blender/python/bmesh/bmesh_py_types.h @@ -101,7 +101,7 @@ typedef struct BPy_BMElemSeq { * If this veriable is set, it will be used */ /* we hold a reference to this. - * check incase the owner becomes invalid on access */ + * check in case the owner becomes invalid on access */ /* TODO - make this a GC'd object!, will function OK without this though */ BPy_BMElem *py_ele; diff --git a/source/blender/python/generic/bpy_internal_import.c b/source/blender/python/generic/bpy_internal_import.c index ecf65275483..36308cdc3e5 100644 --- a/source/blender/python/generic/bpy_internal_import.c +++ b/source/blender/python/generic/bpy_internal_import.c @@ -244,7 +244,7 @@ static PyObject *blender_import(PyObject *UNUSED(self), PyObject *args, PyObject if (newmodule) return newmodule; - PyErr_Fetch(&exception, &err, &tb); /* get the python error incase we cant import as blender text either */ + PyErr_Fetch(&exception, &err, &tb); /* get the python error in case we cant import as blender text either */ /* importing from existing modules failed, see if we have this module as blender text */ newmodule = bpy_text_import_name(name, &found); diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c index cf352504f71..238ba8cc11a 100644 --- a/source/blender/python/generic/py_capi_utils.c +++ b/source/blender/python/generic/py_capi_utils.c @@ -332,7 +332,7 @@ PyObject *PyC_ExceptionBuffer(void) Py_INCREF(stdout_backup); // since these were borrowed we dont want them freed when replaced. Py_INCREF(stderr_backup); - PySys_SetObject("stdout", string_io); // both of these are free'd when restoring + PySys_SetObject("stdout", string_io); // both of these are freed when restoring PySys_SetObject("stderr", string_io); PyErr_Restore(error_type, error_value, error_traceback); diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 2f03fd6974f..1ef9c0d3214 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -77,7 +77,7 @@ /* for internal use, when starting and ending python scripts */ -/* incase a python script triggers another python call, stop bpy_context_clear from invalidating */ +/* in case a python script triggers another python call, stop bpy_context_clear from invalidating */ static int py_call_level = 0; BPy_StructRNA *bpy_context_module = NULL; /* for fast access */ diff --git a/source/blender/python/intern/bpy_interface_atexit.c b/source/blender/python/intern/bpy_interface_atexit.c index 53775e7d893..536cb7785e4 100644 --- a/source/blender/python/intern/bpy_interface_atexit.c +++ b/source/blender/python/intern/bpy_interface_atexit.c @@ -92,5 +92,5 @@ void BPY_atexit_unregister(void) BLI_assert(func_bpy_atregister != NULL); atexit_func_call("unregister", func_bpy_atregister); - func_bpy_atregister = NULL; /* don't really need to set but just incase */ + func_bpy_atregister = NULL; /* don't really need to set but just in case */ } diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c index b292d00df2e..140e2f3ad7c 100644 --- a/source/blender/python/intern/bpy_operator.c +++ b/source/blender/python/intern/bpy_operator.c @@ -433,7 +433,7 @@ static PyObject *pyop_getinstance(PyObject *UNUSED(self), PyObject *value) op = PyMem_MALLOC(sizeof(wmOperator)); memset(op, 0, sizeof(wmOperator)); #endif - BLI_strncpy(op->idname, op->idname, sizeof(op->idname)); /* incase its needed */ + BLI_strncpy(op->idname, op->idname, sizeof(op->idname)); /* in case its needed */ op->type = ot; RNA_pointer_create(NULL, &RNA_Operator, op, &ptr); diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index ba07070e64b..b543f426751 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -121,7 +121,7 @@ int pyrna_prop_validity_check(BPy_PropertyRNA *self) static void pyrna_invalidate(BPy_DummyPointerRNA *self) { self->ptr.type = NULL; /* this is checked for validity */ - self->ptr.id.data = NULL; /* should not be needed but prevent bad pointer access, just incase */ + self->ptr.id.data = NULL; /* should not be needed but prevent bad pointer access, just in case */ } #endif @@ -1284,7 +1284,7 @@ static PyObject *pyrna_enum_to_py(PointerRNA *ptr, PropertyRNA *prop, int val) else { const char *ptr_name = RNA_struct_name_get_alloc(ptr, NULL, 0, NULL); - /* prefer not fail silently incase of api errors, maybe disable it later */ + /* prefer not fail silently in case of api errors, maybe disable it later */ printf("RNA Warning: Current value \"%d\" " "matches no enum in '%s', '%s', '%s'\n", val, RNA_struct_identifier(ptr->type), @@ -3361,7 +3361,7 @@ static PyObject *pyrna_struct_dir(BPy_StructRNA *self) PYRNA_STRUCT_CHECK_OBJ(self); - /* Include this incase this instance is a subtype of a python class + /* Include this in case this instance is a subtype of a python class * In these instances we may want to return a function or variable provided by the subtype * */ ret = PyList_New(0); @@ -3498,7 +3498,7 @@ static PyObject *pyrna_struct_getattro(BPy_StructRNA *self, PyObject *pyname) name); ret = NULL; #endif - /* Include this incase this instance is a subtype of a python class + /* Include this in case this instance is a subtype of a python class * In these instances we may want to return a function or variable provided by the subtype * * Also needed to return methods when its not a subtype @@ -3695,7 +3695,7 @@ static PyObject *pyrna_prop_dir(BPy_PropertyRNA *self) PyObject *ret; PointerRNA r_ptr; - /* Include this incase this instance is a subtype of a python class + /* Include this in case this instance is a subtype of a python class * In these instances we may want to return a function or variable provided by the subtype * */ ret = PyList_New(0); @@ -7278,7 +7278,7 @@ static PyObject *pyrna_register_class(PyObject *UNUSED(self), PyObject *py_class pyrna_subtype_set_rna(py_class, srna_new); /* takes a ref to py_class */ - /* old srna still references us, keep the check incase registering somehow can free it */ + /* old srna still references us, keep the check in case registering somehow can free it */ if (RNA_struct_py_type_get(srna)) { RNA_struct_py_type_set(srna, NULL); // Py_DECREF(py_class); // should be able to do this XXX since the old rna adds a new ref. diff --git a/source/blender/render/intern/include/sunsky.h b/source/blender/render/intern/include/sunsky.h index 5076a1541af..62b68484629 100644 --- a/source/blender/render/intern/include/sunsky.h +++ b/source/blender/render/intern/include/sunsky.h @@ -24,11 +24,6 @@ * \ingroup render */ -/** - * This feature comes from Preetham paper on "A Practical Analytic Model for Daylight" - * and example code from Brian Smits, another author of that paper in - * http://www.cs.utah.edu/vissim/papers/sunsky/code/ - * */ #ifndef __SUNSKY_H__ #define __SUNSKY_H__ @@ -41,14 +36,14 @@ typedef struct SunSky short effect_type, skyblendtype, sky_colorspace; float turbidity; float theta, phi; - + float toSun[3]; /*float sunSpectralRaddata[SPECTRUM_MAX_COMPONENTS];*/ float sunSolidAngle; float zenith_Y, zenith_x, zenith_y; - + float perez_Y[5], perez_x[5], perez_y[5]; /* suggested by glome in @@ -75,75 +70,16 @@ typedef struct SunSky float atm_BetaMie[3]; float atm_BetaDashMie[3]; float atm_BetaRM[3]; -}SunSky; +} SunSky; -/** - * InitSunSky: - * this function compute some sun,sky parameters according to input parameters and also initiate some other sun, sky parameters - * parameters: - * sunSky, is a structure that contains informtion about sun, sky and atmosphere, in this function, most of its values initiated - * turb, is atmosphere turbidity - * toSun, contains sun direction - * horizon_brighness, controls the brightness of the horizon colors - * spread, controls colors spreed at horizon - * sun_brightness, controls sun's brightness - * sun_size, controls sun's size - * back_scatter, controls back scatter light - * */ void InitSunSky(struct SunSky *sunsky, float turb, float *toSun, float horizon_brightness, - float spread,float sun_brightness, float sun_size, float back_scatter, - float skyblendfac, short skyblendtype, float sky_exposure, float sky_colorspace); - -/** - * GetSkyXYZRadiance: - * this function compute sky radiance according to a view parameters `theta' and `phi'and sunSky values - * parameters: - * sunSky, sontains sun and sky parameters - * theta, is sun's theta - * phi, is sun's phi - * color_out, is computed color that shows sky radiance in XYZ color format - * */ -void GetSkyXYZRadiance(struct SunSky* sunsky, float theta, float phi, float color_out[3]); + float spread,float sun_brightness, float sun_size, float back_scatter, + float skyblendfac, short skyblendtype, float sky_exposure, float sky_colorspace); -/** - * GetSkyXYZRadiancef: - * this function compute sky radiance according to a view direction `varg' and sunSky values - * parameters: - * sunSky, sontains sun and sky parameters - * varg, shows direction - * color_out, is computed color that shows sky radiance in XYZ color format - * */ -void GetSkyXYZRadiancef(struct SunSky* sunsky, const float varg[3], float color_out[3]); - -/** - * InitAtmosphere: - * this function intiate sunSky structure with user input parameters. - * parameters: - * sunSky, contains information about sun, and in this function some atmosphere parameters will initiated - * sun_intens, shows sun intensity value - * mief, Mie scattering factor this factor currently call with 1.0 - * rayf, Rayleigh scattering factor, this factor currently call with 1.0 - * inscattf, inscatter light factor that range from 0.0 to 1.0, 0.0 means no inscatter light and 1.0 means full inscatter light - * extincf, extinction light factor that range from 0.0 to 1.0, 0.0 means no extinction and 1.0 means full extinction - * disf, is distance factor, multiplyed to pixle's z value to compute each pixle's distance to camera, - * */ +void GetSkyXYZRadiance(struct SunSky *sunsky, float theta, float phi, float color_out[3]); +void GetSkyXYZRadiancef(struct SunSky *sunsky, const float varg[3], float color_out[3]); void InitAtmosphere(struct SunSky *sunSky, float sun_intens, float mief, float rayf, float inscattf, float extincf, float disf); - -/** - * AtmospherePixleShader: - * this function apply atmosphere effect on a pixle color `rgb' at distance `s' - * parameters: - * sunSky, contains information about sun parameters and user values - * view, is camera view vector - * s, is distance - * rgb, contains rendered color value for a pixle - * */ -void AtmospherePixleShader( struct SunSky* sunSky, float view[3], float s, float rgb[3]); - -/** - * ClipColor: - * clip a color to range [0,1]; - * */ +void AtmospherePixleShader( struct SunSky *sunSky, float view[3], float s, float rgb[3]); void ClipColor(float c[3]); #endif /*__SUNSKY_H__*/ diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 4f891ea17c2..89e10cf37eb 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -5052,7 +5052,7 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l /* if no camera, viewmat should have been set! */ if(use_camera_view && camera) { - /* called before but need to call again incase of lens animation from the + /* 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' */ RE_SetCamera(re, camera); diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index dfa5acc81e7..d06df07f6b0 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2008,7 +2008,7 @@ void RE_BlenderFrame(Render *re, Main *bmain, Scene *scene, SceneRenderLayer *sr if(write_still && !G.afbreek) { if(BKE_imtype_is_movie(scene->r.im_format.imtype)) { - /* operator checks this but incase its called from elsewhere */ + /* operator checks this but in case its called from elsewhere */ printf("Error: cant write single images with a movie format!\n"); } else { diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index 5dbb98d20c2..76b9537116b 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -651,7 +651,7 @@ static float mg_distNoiseTex(Tex *tex, float *texvec, TexResult *texres) static float voronoiTex(Tex *tex, float *texvec, TexResult *texres) { int rv = TEX_INT; - float da[4], pa[12]; /* distance and point coordinate arrays of 4 nearest neighbours */ + float da[4], pa[12]; /* distance and point coordinate arrays of 4 nearest neighbors */ float aw1 = fabs(tex->vn_w1); float aw2 = fabs(tex->vn_w2); float aw3 = fabs(tex->vn_w3); diff --git a/source/blender/render/intern/source/sunsky.c b/source/blender/render/intern/source/sunsky.c index 71ca2e056ac..1ecf197f694 100644 --- a/source/blender/render/intern/source/sunsky.c +++ b/source/blender/render/intern/source/sunsky.c @@ -20,6 +20,10 @@ /** \file blender/render/intern/source/sunsky.c * \ingroup render + * + * This feature comes from Preetham paper on "A Practical Analytic Model for Daylight" + * and example code from Brian Smits, another author of that paper in + * http://www.cs.utah.edu/vissim/papers/sunsky/code/ */ @@ -129,7 +133,7 @@ static float PerezFunction(struct SunSky *sunsky, const float *lam, float theta, * InitSunSky: * this function compute some sun,sky parameters according to input parameters and also initiate some other sun, sky parameters * parameters: - * sunSky, is a structure that contains informtion about sun, sky and atmosphere, in this function, most of its values initiated + * sunSky, is a structure that contains information about sun, sky and atmosphere, in this function, most of its values initiated * turb, is atmosphere turbidity * toSun, contains sun direction * horizon_brighness, controls the brightness of the horizon colors @@ -345,7 +349,7 @@ static void ComputeAttenuatedSunlight(float theta, int turbidity, float fTau[3]) /** * InitAtmosphere: - * this function intiate sunSky structure with user input parameters. + * this function initiate sunSky structure with user input parameters. * parameters: * sunSky, contains information about sun, and in this function some atmosphere parameters will initiated * sun_intens, shows sun intensity value diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c index 7ca67abe3a1..f99eb0298bf 100644 --- a/source/blender/render/intern/source/volume_precache.c +++ b/source/blender/render/intern/source/volume_precache.c @@ -437,7 +437,7 @@ static void multiple_scattering_diffusion(Render *re, VolumePrecache *vp, Materi if (re->test_break(re->tbh)) break; } - /* normalisation factor to conserve energy */ + /* normalization factor to conserve energy */ energy_ms = total_ms_energy(re, do_test_break, sr, sg, sb, n); fac *= (energy_ss / energy_ms); diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index eecc9cab028..21ea1bf909f 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -230,7 +230,7 @@ wmOperator *WM_operator_last_redo(const struct bContext *C); #define WM_FILESEL_FILES (1 << 4) - /* operator as a python command (resultuing string must be free'd) */ + /* operator as a python command (resultuing string must be freed) */ char *WM_operator_pystring(struct bContext *C, struct wmOperatorType *ot, struct PointerRNA *opptr, int all_args); void WM_operator_bl_idname(char *to, const char *from); void WM_operator_py_idname(char *to, const char *from); diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index c6c67e22bfd..3aa974bd9f4 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -76,7 +76,7 @@ void WM_operator_free(wmOperator *op) #ifdef WITH_PYTHON if(op->py_instance) { - /* do this first incase there are any __del__ functions or + /* do this first in case there are any __del__ functions or * similar that use properties */ BPY_DECREF(op->py_instance); } diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 7bc0557b631..591b8b1103b 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -744,7 +744,7 @@ static int wm_operator_init_from_last(wmWindowManager *wm, wmOperator *op) wmOperator *lastop; for(lastop= wm->operators.last; lastop; lastop= lastop->prev) { - /* equality check is a bit paranoid but just incase */ + /* equality check is a bit paranoid but just in case */ if((op != lastop) && (op->type == (lastop->type))) { break; } @@ -1701,7 +1701,7 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers) /* XXX code this for all modal ops, and ensure free only happens here */ /* modal ui handler can be tagged to be freed */ - if(BLI_findindex(handlers, handler) != -1) { /* could be free'd already by regular modal ops */ + if(BLI_findindex(handlers, handler) != -1) { /* could be freed already by regular modal ops */ if(handler->flag & WM_HANDLER_DO_FREE) { BLI_remlink(handlers, handler); wm_event_free_handler(handler); diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index d603262227f..d34a7d46e54 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -621,7 +621,7 @@ static void wm_keymap_diff_update(ListBase *lb, wmKeyMap *defaultmap, wmKeyMap * /* name id's are for storing general or multiple keymaps, space/region ids are same as DNA_space_types.h */ -/* gets free'd in wm.c */ +/* gets freed in wm.c */ wmKeyMap *WM_keymap_list_find(ListBase *lb, const char *idname, int spaceid, int regionid) { diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 290046d59ab..cab4b014c3e 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -469,7 +469,7 @@ void WM_operator_py_idname(char *to, const char *from) BLI_strncpy(to+(ofs+1), sep+4, OP_MAX_TYPENAME); } else { - /* should not happen but support just incase */ + /* should not happen but support just in case */ BLI_strncpy(to, from, OP_MAX_TYPENAME); } } @@ -490,7 +490,7 @@ void WM_operator_bl_idname(char *to, const char *from) BLI_strncpy(to+(ofs+4), sep+1, OP_MAX_TYPENAME); } else { - /* should not happen but support just incase */ + /* should not happen but support just in case */ BLI_strncpy(to, from, OP_MAX_TYPENAME); } } @@ -666,7 +666,7 @@ void WM_operator_properties_free(PointerRNA *ptr) if(properties) { IDP_FreeProperty(properties); MEM_freeN(properties); - ptr->data= NULL; /* just incase */ + ptr->data= NULL; /* just in case */ } } |