diff options
Diffstat (limited to 'source/blender/blenkernel')
28 files changed, 85 insertions, 81 deletions
diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h index d3d8546ddae..15c93bd58fa 100644 --- a/source/blender/blenkernel/BKE_bvhutils.h +++ b/source/blender/blenkernel/BKE_bvhutils.h @@ -75,7 +75,7 @@ typedef struct BVHTreeFromMesh * * The tree is build in mesh space coordinates, this means special care must be made on queries * so that the coordinates and rays are first translated on the mesh local coordinates. - * Reason for this is that later bvh_from_mesh_* might use a cache system and so it becames possible to reuse + * Reason for this is that later bvh_from_mesh_* might use a cache system and so it becomes possible to reuse * a BVHTree. * * free_bvhtree_from_mesh should be called when the tree is no longer needed. @@ -88,7 +88,7 @@ BVHTree* bvhtree_from_mesh_verts(struct BVHTreeFromMesh *data, struct DerivedMes * * The tree is build in mesh space coordinates, this means special care must be made on queries * so that the coordinates and rays are first translated on the mesh local coordinates. - * Reason for this is that later bvh_from_mesh_* might use a cache system and so it becames possible to reuse + * Reason for this is that later bvh_from_mesh_* might use a cache system and so it becomes possible to reuse * a BVHTree. * * The returned value is the same as in data->tree, its only returned to make it easier to test @@ -124,7 +124,7 @@ typedef struct LinkNode* BVHCache; /* - * Queries a bvhcache for the chache bvhtree of the request type + * Queries a bvhcache for the cache bvhtree of the request type */ BVHTree *bvhcache_find(BVHCache *cache, int type); diff --git a/source/blender/blenkernel/BKE_fcurve.h b/source/blender/blenkernel/BKE_fcurve.h index d79d6a204b9..b615ac60c3e 100644 --- a/source/blender/blenkernel/BKE_fcurve.h +++ b/source/blender/blenkernel/BKE_fcurve.h @@ -135,7 +135,7 @@ typedef struct FModifierTypeInfo { void (*evaluate_modifier)(struct FCurve *fcu, struct FModifier *fcm, float *cvalue, float evaltime); } FModifierTypeInfo; -/* Values which describe the behaviour of a FModifier Type */ +/* Values which describe the behavior of a FModifier Type */ typedef enum eFMI_Action_Types { /* modifier only modifies values outside of data range */ FMI_TYPE_EXTRAPOLATION = 0, diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index d787993e030..d54874f1fb8 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -170,7 +170,7 @@ void give_ibuf_prefetch_request(SeqRenderData context, float cfra, int chan_show int seqbase_recursive_apply(struct ListBase *seqbase, int (*apply_func)(struct Sequence *seq, void *), void *arg); int seq_recursive_apply(struct Sequence *seq, int (*apply_func)(struct Sequence *, void *), void *arg); -/* maintainance functions, mostly for RNA */ +/* maintenance functions, mostly for RNA */ // extern void seq_free_sequence(struct Scene *scene, struct Sequence *seq); void seq_free_sequence_recurse(struct Scene *scene, struct Sequence *seq); diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 16dd722f1fc..9d5b8a3b6a5 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1359,7 +1359,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos } } } else { - /* default behaviour for meshes */ + /* default behavior for meshes */ if(inputVertexCos) deformedVerts = inputVertexCos; else diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 77523980a64..d0733166074 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -81,7 +81,7 @@ static void object_duplilist_recursive(ID *id, Scene *scene, Object *ob, ListBas /* ******************************************************************** */ /* Animation Visualisation */ -/* Initialise the default settings for animation visualisation */ +/* Initialize the default settings for animation visualisation */ void animviz_settings_init(bAnimVizSettings *avs) { /* sanity check */ @@ -234,7 +234,7 @@ typedef struct MPathTarget { /* get list of motion paths to be baked for the given object * - assumes the given list is ready to be used */ -// TODO: it would be nice in future to be able to update objects dependant on these bones too? +// TODO: it would be nice in future to be able to update objects dependent on these bones too? void animviz_get_object_motionpaths(Object *ob, ListBase *targets) { MPathTarget *mpt; diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index c3d2425f280..ec92685b594 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -2144,7 +2144,7 @@ static void animsys_evaluate_overrides (PointerRNA *ptr, AnimData *adt) /* Overview of how this system works: * 1) Depsgraph sorts data as necessary, so that data is in an order that means - * that all dependences are resolved before dependants. + * that all dependencies are resolved before dependants. * 2) All normal animation is evaluated, so that drivers have some basis values to * work with * a. NLA stacks are done first, as the Active Actions act as 'tweaking' tracks @@ -2153,14 +2153,14 @@ static void animsys_evaluate_overrides (PointerRNA *ptr, AnimData *adt) * * --------------< often in a separate phase... >------------------ * - * 3) Drivers/expressions are evaluated on top of this, in an order where dependences are + * 3) Drivers/expressions are evaluated on top of this, in an order where dependencies are * resolved nicely. * Note: it may be necessary to have some tools to handle the cases where some higher-level * drivers are added and cause some problematic dependencies that didn't exist in the local levels... * * --------------< always executed >------------------ * - * Maintainance of editability of settings (XXX): + * Maintenance of editability of settings (XXX): * In order to ensure that settings that are animated can still be manipulated in the UI without requiring * that keyframes are added to prevent these values from being overwritten, we use 'overrides'. * diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 39cfd1ad9e6..4fafd604e70 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -2100,7 +2100,7 @@ DerivedMesh *CDDM_copy_from_tessface(DerivedMesh *source) } /* note, the CD_ORIGINDEX layers are all 0, so if there is a direct - * relationship betwen mesh data this needs to be set by the caller. */ + * relationship between mesh data this needs to be set by the caller. */ DerivedMesh *CDDM_from_template(DerivedMesh *source, int numVerts, int numEdges, int numTessFaces, int numLoops, int numPolys) diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index ecb1ae4bed3..5e65d104a03 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -1380,7 +1380,7 @@ static void machine_epsilon_offset(Cloth *cloth) cv = cloth->verts; for (i=0; i<cloth->numverts; i++, cv++) { - /*aggrevatingly enough, it's necassary to offset the coordinates + /*aggrevatingly enough, it's necessary to offset the coordinates by a multiple of the 32-bit floating point epsilon when switching into doubles*/ #define RNDSIGN (float)(-1*(BLI_rand()%2==0)|1) diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index e8cd1526880..9047f0262cd 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -671,7 +671,7 @@ static void default_get_tarmat (bConstraint *con, bConstraintOb *UNUSED(cob), bC } /* This following macro should be used for all standard single-target *_get_tars functions - * to save typing and reduce maintainance woes. + * to save typing and reduce maintenance woes. * (Hopefully all compilers will be happy with the lines with just a space on them. Those are * really just to help this code easier to read) */ @@ -705,7 +705,7 @@ static void default_get_tarmat (bConstraint *con, bConstraintOb *UNUSED(cob), bC } /* This following macro should be used for all standard single-target *_get_tars functions - * to save typing and reduce maintainance woes. It does not do the subtarget related operations + * to save typing and reduce maintenance woes. It does not do the subtarget related operations * (Hopefully all compilers will be happy with the lines with just a space on them. Those are * really just to help this code easier to read) */ @@ -724,7 +724,7 @@ static void default_get_tarmat (bConstraint *con, bConstraintOb *UNUSED(cob), bC } /* This following macro should be used for all standard single-target *_flush_tars functions - * to save typing and reduce maintainance woes. + * to save typing and reduce maintenance woes. * Note: the pointer to ct will be changed to point to the next in the list (as it gets removed) * (Hopefully all compilers will be happy with the lines with just a space on them. Those are * really just to help this code easier to read) @@ -745,7 +745,7 @@ static void default_get_tarmat (bConstraint *con, bConstraintOb *UNUSED(cob), bC } /* This following macro should be used for all standard single-target *_flush_tars functions - * to save typing and reduce maintainance woes. It does not do the subtarget related operations. + * to save typing and reduce maintenance woes. It does not do the subtarget related operations. * Note: the pointer to ct will be changed to point to the next in the list (as it gets removed) * (Hopefully all compilers will be happy with the lines with just a space on them. Those are * really just to help this code easier to read) @@ -2221,7 +2221,7 @@ static void actcon_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstraint object_to_mat4(&workob, ct->matrix); } else { - /* behaviour undefined... */ + /* behavior undefined... */ puts("Error: unknown owner type for Action Constraint"); } } @@ -3920,7 +3920,7 @@ static bConstraintTypeInfo CTI_PIVOT = { NULL, /* relink data */ pivotcon_id_looper, /* id looper */ NULL, /* copy data */ - NULL, /* new data */ // XXX: might be needed to get 'normal' pivot behaviour... + NULL, /* new data */ // XXX: might be needed to get 'normal' pivot behavior... pivotcon_get_tars, /* get constraint targets */ pivotcon_flush_tars, /* flush constraint targets */ default_get_tarmat, /* get target matrix */ diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 7ed9a7603ac..bfd5ac0bb09 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -104,7 +104,7 @@ typedef struct LayerTypeInfo { default is assumed to be all zeros */ void (*set_default)(void *data, int count); - /* functions necassary for geometry collapse*/ + /* functions necessary for geometry collapse*/ int (*equal)(void *data1, void *data2); void (*multiply)(void *data, float fac); void (*initminmax)(void *min, void *max); @@ -1664,7 +1664,7 @@ void *CustomData_duplicate_referenced_layer(struct CustomData *data, const int t layer = &data->layers[layer_index]; if (layer->flag & CD_FLAG_NOFREE) { - /* MEM_dupallocN won’t work in case of complex layers, like e.g. + /* MEM_dupallocN won't work in case of complex layers, like e.g. * CD_MDEFORMVERT, which has pointers to allocated data... * So in case a custom copy function is defined, use it! */ @@ -1697,7 +1697,7 @@ void *CustomData_duplicate_referenced_layer_named(struct CustomData *data, layer = &data->layers[layer_index]; if (layer->flag & CD_FLAG_NOFREE) { - /* MEM_dupallocN won’t work in case of complex layers, like e.g. + /* MEM_dupallocN won't work in case of complex layers, like e.g. * CD_MDEFORMVERT, which has pointers to allocated data... * So in case a custom copy function is defined, use it! */ diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index 822293c35e1..f2246da930c 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -603,7 +603,7 @@ MDeformWeight *defvert_verify_index(MDeformVert *dvert, const int defgroup) /* TODO. merge with code above! */ /* Adds the given vertex to the specified vertex group, with given weight. - * warning, this does NOT check for existign, assume caller already knows its not there */ + * warning, this does NOT check for existing, assume caller already knows its not there */ void defvert_add_index_notest(MDeformVert *dvert, int defgroup, const float weight) { MDeformWeight *dw_new; diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index a5097054de2..c45687f0b93 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -1116,7 +1116,7 @@ void graph_bfs(void) pos[i] = 0; /* Init - * dagnode.first is alway the root (scene) + * dagnode.first is always the root (scene) */ node = MainDag->DagNode.first; while(node) { @@ -1185,7 +1185,7 @@ int pre_and_post_source_BFS(DagForest *dag, short mask, DagNode *source, graph_a /* fprintf(stderr,"starting BFS \n ------------\n"); */ /* Init - * dagnode.first is alway the root (scene) + * dagnode.first is always the root (scene) */ node = dag->DagNode.first; nqueue = queue_create(DAGQUEUEALLOC); @@ -1252,7 +1252,7 @@ DagNodeQueue * graph_dfs(void) pos[i] = 0; /* Init - * dagnode.first is alway the root (scene) + * dagnode.first is always the root (scene) */ node = MainDag->DagNode.first; while(node) { @@ -1376,7 +1376,7 @@ int pre_and_post_source_DFS(DagForest *dag, short mask, DagNode *source, graph_a nqueue = queue_create(DAGQUEUEALLOC); /* Init - * dagnode.first is alway the root (scene) + * dagnode.first is always the root (scene) */ node = dag->DagNode.first; while(node) { diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index edd1bc6d679..83d64f693e2 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -84,7 +84,7 @@ static float gaussianFactors[5] = { 0.996849f, 0.524141f}; static float gaussianTotal = 3.309425f; -/* UV Image neighbouring pixel table x and y list */ +/* UV Image neighboring pixel table x and y list */ static int neighX[8] = {1,1,0,-1,-1,-1, 0, 1}; static int neighY[8] = {0,1,1, 1, 0,-1,-1,-1}; @@ -139,7 +139,7 @@ typedef struct Vec3f { } Vec3f; typedef struct BakeAdjPoint { - float dir[3]; /* vector pointing towards this neighbour */ + float dir[3]; /* vector pointing towards this neighbor */ float dist; /* distance to */ } BakeAdjPoint; @@ -160,7 +160,7 @@ typedef struct PaintBakeData { Bounds3D mesh_bounds; /* adjacency info */ - BakeAdjPoint *bNeighs; /* current global neighbour distances and directions, if required */ + BakeAdjPoint *bNeighs; /* current global neighbor distances and directions, if required */ double average_dist; /* space partitioning */ VolumeGrid *grid; /* space partitioning grid to optimize brush checks */ @@ -183,7 +183,7 @@ typedef struct PaintUVPoint { unsigned int v1, v2, v3; /* vertex indexes */ unsigned int neighbour_pixel; /* If this pixel isn't uv mapped to any face, - but it's neighbouring pixel is */ + but it's neighboring pixel is */ short quad; } PaintUVPoint; @@ -196,7 +196,7 @@ typedef struct ImgSeqFormatData { #define ADJ_ON_MESH_EDGE (1<<0) typedef struct PaintAdjData { - int *n_target; /* array of neighbouring point indexes, + int *n_target; /* array of neighboring point indexes, for single sample use (n_index+neigh_num) */ int *n_index; /* index to start reading n_target for each point */ int *n_num; /* num of neighs for each point */ @@ -1308,7 +1308,7 @@ static void dynamicPaint_initAdjacencyData(DynamicPaintSurface *surface, int for n_pos += ad->n_num[i]; } - /* and now add neighbour data using that info */ + /* and now add neighbor data using that info */ for (i=0; i<numOfEdges; i++) { /* first vertex */ int index = edge[i].v1; @@ -1889,7 +1889,7 @@ struct DerivedMesh *dynamicPaint_Modifier_do(DynamicPaintModifierData *pmd, Scen /***************************** Image Sequence / UV Image Surface Calls ******************************/ /* -* Tries to find the neighbouring pixel in given (uv space) direction. +* Tries to find the neighboring pixel in given (uv space) direction. * Result is used by effect system to move paint on the surface. * * px,py : origin pixel x and y @@ -1898,7 +1898,7 @@ struct DerivedMesh *dynamicPaint_Modifier_do(DynamicPaintModifierData *pmd, Scen static int dynamicPaint_findNeighbourPixel(PaintUVPoint *tempPoints, DerivedMesh *dm, const char *uvname, int w, int h, int px, int py, int n_index) { - /* Note: Current method only uses polygon edges to detect neighbouring pixels. + /* Note: Current method only uses polygon edges to detect neighboring pixels. * -> It doesn't always lead to the optimum pixel but is accurate enough * and faster/simplier than including possible face tip point links) */ @@ -1914,11 +1914,11 @@ static int dynamicPaint_findNeighbourPixel(PaintUVPoint *tempPoints, DerivedMesh if (x<0 || x>=w) return OUT_OF_TEXTURE; if (y<0 || y>=h) return OUT_OF_TEXTURE; - tPoint = &tempPoints[x+w*y]; /* UV neighbour */ + tPoint = &tempPoints[x+w*y]; /* UV neighbor */ cPoint = &tempPoints[px+w*py]; /* Origin point */ /* - * Check if shifted point is on same face -> it's a correct neighbour + * Check if shifted point is on same face -> it's a correct neighbor * (and if it isn't marked as an "edge pixel") */ if ((tPoint->face_index == cPoint->face_index) && (tPoint->neighbour_pixel == -1)) @@ -1937,11 +1937,11 @@ static int dynamicPaint_findNeighbourPixel(PaintUVPoint *tempPoints, DerivedMesh } /* - * If we get here, the actual neighbouring pixel + * If we get here, the actual neighboring pixel * is located on a non-linked uv face, and we have to find * it's "real" position. * - * Simple neighbouring face finding algorithm: + * Simple neighboring face finding algorithm: * - find closest uv edge to shifted pixel and get * the another face that shares that edge * - find corresponding position of that new face edge @@ -2075,7 +2075,7 @@ static int dynamicPaint_findNeighbourPixel(PaintUVPoint *tempPoints, DerivedMesh if (tempPoints[final_index].face_index != target_face) return NOT_FOUND; /* - * If final point is an "edge pixel", use it's "real" neighbour instead + * If final point is an "edge pixel", use it's "real" neighbor instead */ if (tempPoints[final_index].neighbour_pixel != -1) final_index = cPoint->neighbour_pixel; @@ -2322,7 +2322,7 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface) /* * Now loop through every pixel that was left without index - * and find if they have neighbouring pixels that have an index. + * and find if they have neighboring pixels that have an index. * If so use that polygon as pixel surface. * (To avoid seams on uv island edges) */ @@ -2350,14 +2350,14 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface) point[0] = ((float)tx + 0.5f) / w; point[1] = ((float)ty + 0.5f) / h; - /* search through defined area for neighbour */ + /* search through defined area for neighbor */ for (u=u_min; u<=u_max; u++) for (v=v_min; v<=v_max; v++) { /* if not this pixel itself */ if (u!=0 || v!=0) { ind = (tx+u)+w*(ty+v); - /* if neighbour has index */ + /* if neighbor has index */ if (tempPoints[ind].face_index != -1) { float uv1co[2], uv2co[2], uv3co[2], uv[2]; @@ -2402,7 +2402,7 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface) } /* - * When base loop is over convert found neighbour indexes to real ones + * When base loop is over convert found neighbor indexes to real ones * Also count the final number of active surface points */ for (ty = 0; ty < h; ty++) @@ -2450,7 +2450,7 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface) for (i=0; i<8; i++) { - /* Try to find a neighbouring pixel in defined direction + /* Try to find a neighboring pixel in defined direction * If not found, -1 is returned */ int n_target = dynamicPaint_findNeighbourPixel(tempPoints, dm, uvname, w, h, tx, ty, i); @@ -3948,7 +3948,7 @@ void surface_determineForceTargetPoints(PaintSurfaceData *sData, int index, floa if (n_index == closest_id[0]) continue; - /* only accept neighbour at "other side" of the first one in relation to force dir + /* only accept neighbor at "other side" of the first one in relation to force dir * so make sure angle between this and closest neigh is greater than first angle */ if (dir_dot>closest_d[1] && closest_dot<closest_d[0] && dir_dot>0.0f) {closest_d[1]=dir_dot; closest_id[1]=n_index;} } @@ -3983,7 +3983,7 @@ void surface_determineForceTargetPoints(PaintSurfaceData *sData, int index, floa closest_d[1] *= acosf(temp)/1.57079633f; } else { - /* if only single neighbour, still linearize force intersection effect */ + /* if only single neighbor, still linearize force intersection effect */ closest_d[0] = 1.0f - acosf(closest_d[0])/1.57079633f; } } @@ -4177,7 +4177,7 @@ static void dynamicPaint_doEffectStep(DynamicPaintSurface *surface, float *force /* Only reads values from the surface copy (prevPoint[]), * so this one is thread safe */ - /* Loop through neighbouring points */ + /* Loop through neighboring points */ for (i=0; i<numOfNeighs; i++) { int n_index = sData->adj_data->n_index[index]+i; float w_factor; @@ -4226,7 +4226,7 @@ static void dynamicPaint_doEffectStep(DynamicPaintSurface *surface, float *force totalAlpha += ePoint->e_alpha; - /* Check if neighbouring point has lower alpha, + /* Check if neighboring point has lower alpha, * if so, decrease this point's alpha as well*/ if (pPoint->alpha <= 0.0f && pPoint->e_alpha <= 0.0f && pPoint->wetness <= 0.0f) continue; diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index 8098706e370..d1edd2c9d0f 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -99,7 +99,7 @@ static FModifierTypeInfo FMI_MODNAME = { /* Generators available: * 1) simple polynomial generator: * - Exanded form - (y = C[0]*(x^(n)) + C[1]*(x^(n-1)) + ... + C[n]) - * - Factorised form - (y = (C[0][0]*x + C[0][1]) * (C[1][0]*x + C[1][1]) * ... * (C[n][0]*x + C[n][1])) + * - Factorized form - (y = (C[0][0]*x + C[0][1]) * (C[1][0]*x + C[1][1]) * ... * (C[n][0]*x + C[n][1])) */ static void fcm_generator_free (FModifier *fcm) @@ -198,7 +198,7 @@ static void fcm_generator_evaluate (FCurve *UNUSED(fcu), FModifier *fcm, float * { FMod_Generator *data= (FMod_Generator *)fcm->data; - /* behaviour depends on mode + /* behavior depends on mode * NOTE: the data in its default state is fine too */ switch (data->mode) { @@ -238,7 +238,7 @@ static void fcm_generator_evaluate (FCurve *UNUSED(fcu), FModifier *fcm, float * } break; - case FCM_GENERATOR_POLYNOMIAL_FACTORISED: /* factorised polynomial */ + case FCM_GENERATOR_POLYNOMIAL_FACTORISED: /* Factorized polynomial */ { float value= 1.0f, *cp=NULL; unsigned int i; @@ -506,13 +506,15 @@ static FModifierTypeInfo FMI_ENVELOPE = { /* Cycles F-Curve Modifier --------------------------- */ /* This modifier changes evaltime to something that exists within the curve's frame-range, - * then re-evaluates modifier stack up to this point using the new time. This re-entrant behaviour - * is very likely to be more time-consuming than the original approach... (which was tighly integrated into + * then re-evaluates modifier stack up to this point using the new time. This re-entrant behavior + * is very likely to be more time-consuming than the original approach... (which was tightly integrated into * the calculation code...). * - * NOTE: this needs to be at the start of the stack to be of use, as it needs to know the extents of the keyframes/sample-data - * Possible TODO - store length of cycle information that can be initialised from the extents of the keyframes/sample-data, and adjusted - * as appropriate + * NOTE: this needs to be at the start of the stack to be of use, as it needs to know the extents of the + * keyframes/sample-data. + * + * Possible TODO - store length of cycle information that can be initialised from the extents of the + * keyframes/sample-data, and adjusted as appropriate. */ /* temp data used during evaluation */ diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index 093399832a1..5cef30894ef 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -608,7 +608,7 @@ IDProperty *IDP_GetProperties(ID *id, int create_if_needed) if (create_if_needed) { id->properties = MEM_callocN(sizeof(IDProperty), "IDProperty"); id->properties->type = IDP_GROUP; - /* dont overwite the data's name and type + /* dont overwrite the data's name and type * some functions might need this if they * dont have a real ID, should be named elsewhere - Campbell */ /* strcpy(id->name, "top_level_group");*/ diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 43270447dad..db9f6325e89 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1886,7 +1886,7 @@ int do_version_tface(Main *main, int fileload) ma->game.flag = -flag; /* some people uses multitexture with TexFace by creating a texture - * channel which not neccessarly the tf->tpage image. But the game engine + * channel which not necessarily the tf->tpage image. But the game engine * was enabling it. Now it's required to set "Face Texture [Alpha] in the * material settings. */ if (!fileload) diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index c9b73376a3d..f9dc0ef0b93 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -2343,7 +2343,7 @@ int mesh_recalcTesselation(CustomData *fdata, mf->flag = mp->flag; #ifdef USE_TESSFACE_SPEEDUP - mf->edcode |= TESSFACE_SCANFILL; /* tag for sorting loop indicies */ + mf->edcode |= TESSFACE_SCANFILL; /* tag for sorting loop indices */ #endif if (poly_orig_index) { diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index a6795ed3a7d..e5400cf13f2 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -286,7 +286,7 @@ NlaStrip *add_nlastrip (bAction *act) * - selected flag to highlight this to the user * - auto-blends to ensure that blend in/out values are automatically * determined by overlaps of strips - * - (XXX) synchronisation of strip-length in accordance with changes to action-length + * - (XXX) synchronization of strip-length in accordance with changes to action-length * is not done though, since this should only really happens in editmode for strips now * though this decision is still subject to further review... */ @@ -778,7 +778,7 @@ short BKE_nlameta_add_strip (NlaStrip *mstrip, NlaStrip *strip) return 0; /* check if this would need to be added to the ends of the meta, - * and subsequently, if the neighbouring strips allow us enough room + * and subsequently, if the neighboring strips allow us enough room */ if (strip->start < mstrip->start) { /* check if strip to the left (if it exists) ends before the @@ -1235,7 +1235,7 @@ void BKE_nlastrip_validate_fcurves (NlaStrip *strip) /* store path - make copy, and store that */ fcu->rna_path= BLI_strdupn("influence", 9); - // TODO: insert a few keyframes to ensure default behaviour? + // TODO: insert a few keyframes to ensure default behavior? } } @@ -1256,7 +1256,7 @@ void BKE_nlastrip_validate_fcurves (NlaStrip *strip) /* store path - make copy, and store that */ fcu->rna_path= BLI_strdupn("strip_time", 10); - // TODO: insert a few keyframes to ensure default behaviour? + // TODO: insert a few keyframes to ensure default behavior? } } } diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index ba25bee46b5..f9817d5b6f5 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -991,7 +991,7 @@ void ntreeSetOutput(bNodeTree *ntree) { bNode *node; - /* find the active outputs, might become tree type dependant handler */ + /* find the active outputs, might become tree type dependent handler */ for(node= ntree->nodes.first; node; node= node->next) { if(node->typeinfo->nclass==NODE_CLASS_OUTPUT) { bNode *tnode; diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c index 00a66edc2b4..65db275b61f 100644 --- a/source/blender/blenkernel/intern/ocean.c +++ b/source/blender/blenkernel/intern/ocean.c @@ -170,7 +170,7 @@ static float gaussRand (void) } /** - * Som usefull functions + * Some useful functions * */ MINLINE float lerp(float a,float b,float f) { diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 2e91d76cf21..33e2c2376a3 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -2874,10 +2874,12 @@ static void cache_key_incremental_rotation(ParticleCacheKey *key0, ParticleCache copy_v3_v3(prev_tangent, tangent); } } -/* Calculates paths ready for drawing/rendering. */ -/* -Usefull for making use of opengl vertex arrays for super fast strand drawing. */ -/* -Makes child strands possible and creates them too into the cache. */ -/* -Cached path data is also used to determine cut position for the editmode tool. */ + +/** + * Calculates paths ready for drawing/rendering + * - Useful for making use of opengl vertex arrays for super fast strand drawing. + * - Makes child strands possible and creates them too into the cache. + * - Cached path data is also used to determine cut position for the editmode tool. */ void psys_cache_paths(ParticleSimulationData *sim, float cfra) { PARTICLE_PSMD; diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 206d9036ba7..e4800ac25a3 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -974,7 +974,7 @@ static int distribute_compare_orig_index(const void *p1, const void *p2) return -1; else if(index1 == index2) { /* this pointer comparison appears to make qsort stable for glibc, - * and apparently on solaris too, makes the renders reproducable */ + * and apparently on solaris too, makes the renders reproducible */ if(p1 < p2) return -1; else if(p1 == p2) diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 84513f83204..dde3aeba75d 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -306,7 +306,7 @@ static void shrinkwrap_calc_normal_projection(ShrinkwrapCalcData *calc) else { //The code supports any axis that is a combination of X,Y,Z - //altought currently UI only allows to set the 3 diferent axis + //altought currently UI only allows to set the 3 different axis if(calc->smd->projAxis & MOD_SHRINKWRAP_PROJECT_OVER_X_AXIS) proj_axis[0] = 1.0f; if(calc->smd->projAxis & MOD_SHRINKWRAP_PROJECT_OVER_Y_AXIS) proj_axis[1] = 1.0f; if(calc->smd->projAxis & MOD_SHRINKWRAP_PROJECT_OVER_Z_AXIS) proj_axis[2] = 1.0f; @@ -405,7 +405,7 @@ static void shrinkwrap_calc_normal_projection(ShrinkwrapCalcData *calc) * Shrinkwrap moving vertexs to the nearest surface point on the target * * it builds a BVHTree from the target mesh and then performs a - * NN matchs for each vertex + * NN matches for each vertex */ static void shrinkwrap_calc_nearest_surface_point(ShrinkwrapCalcData *calc) { diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index e7dbbf44223..8f0fcc04e1e 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -1163,7 +1163,7 @@ static void smoke_calc_domain(Scene *scene, Object *ob, SmokeModifierData *smd) for(z = 0; z < sds->res[2]; z++) { - // neighbour cell emission densities (for high resolution smoke smooth interpolation) + // neighbor cell emission densities (for high resolution smoke smooth interpolation) float c000, c001, c010, c011, c100, c101, c110, c111; c000 = (x>0 && y>0 && z>0) ? temp_emission_map[smoke_get_index(x-1, sds->res[0], y-1, sds->res[1], z-1)] : 0; diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 063a274715c..c4ea41f41b3 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -988,7 +988,7 @@ static void Vec3PlusStVec(float *v, float s, float *v1) v[2] += s*v1[2]; } -/* +++ dependancy information functions*/ +/* +++ dependency information functions*/ static int are_there_deflectors(Scene *scene, unsigned int layer) { @@ -1007,7 +1007,7 @@ static int query_external_colliders(Scene *scene, Object *me) { return(are_there_deflectors(scene, me->lay)); } -/* --- dependancy information functions*/ +/* --- dependency information functions*/ /* +++ the aabb "force" section*/ @@ -1606,7 +1606,7 @@ static void _scan_for_ext_spring_forces(Scene *scene, Object *ob, float timenow, } f = normalize_v3(vel); f = -0.0001f*f*f*sb->aeroedge; - /* (todo) add a nice angle dependant function done for now BUT */ + /* (todo) add a nice angle dependent function done for now BUT */ /* still there could be some nice drag/lift function, but who needs it */ sub_v3_v3v3(sp, sb->bpoint[bs->v1].pos , sb->bpoint[bs->v2].pos); diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index a63dfa486d4..09056654e09 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -3343,7 +3343,7 @@ struct DerivedMesh *subsurf_make_derived_from_derived( CCGSubSurf *ss; /* It is quite possible there is a much better place to do this. It - * depends a bit on how rigourously we expect this function to never + * depends a bit on how rigorously we expect this function to never * be called in editmode. In semi-theory we could share a single * cache, but the handles used inside and outside editmode are not * the same so we would need some way of converting them. Its probably diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 888d59b78b5..8e3ec4766e9 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -90,7 +90,7 @@ be popped ... other st's retain their own top location. Markers -- -The mrk->flags define the behaviour and relationships between markers. The +The mrk->flags define the behavior and relationships between markers. The upper two bytes are used to hold a group ID, the lower two are normal flags. If TMARK_EDITALL is set the group ID defines which other markers should be edited. @@ -2617,7 +2617,7 @@ void txt_backspace_word (Text *text) } /* Max spaces to replace a tab with, currently hardcoded to TXT_TABSIZE = 4. - * Used by txt_convert_tab_to_spaces, indent and unintent. + * Used by txt_convert_tab_to_spaces, indent and unindent. * Remember to change this string according to max tab size */ static char tab_to_spaces[] = " "; diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index ede2eb7f461..4a509473ac8 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -944,7 +944,7 @@ MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser *u float log2_search_to_pattern_ratio = log(floor(search_to_pattern_ratio)) / M_LN2; int max_pyramid_levels= floor(log2_search_to_pattern_ratio + 1); - /* try to accomodate the user's choice of pyramid level in a way + /* try to accommodate the user's choice of pyramid level in a way * that doesn't cause the coarsest pyramid pattern to be larger * than the search size */ int level= MIN2(track->pyramid_levels, max_pyramid_levels); |