diff options
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/armature.c | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/idprop.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/ipo.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/key.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.c | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index cb54e9158dd..90b411b6f20 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -1379,7 +1379,7 @@ void animsys_evaluate_action (PointerRNA *ptr, bAction *act, AnimMapper *remap, /* calculate influence of strip based for given frame based on blendin/out values */ static float nlastrip_get_influence (NlaStrip *strip, float cframe) { - /* sanity checks - normalise the blendin/out values? */ + /* sanity checks - normalize the blendin/out values? */ strip->blendin= fabsf(strip->blendin); strip->blendout= fabsf(strip->blendout); diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 263e90b6559..9bf8de4a2e1 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -1114,7 +1114,7 @@ void armature_mat_world_to_pose(Object *ob, float inmat[][4], float outmat[][4]) mult_m4_m4m4(outmat, inmat, obmat); } -/* Convert Wolrd-Space Location to Pose-Space Location +/* Convert World-Space Location to Pose-Space Location * NOTE: this cannot be used to convert to pose-space location of the supplied * pose-channel into its local space (i.e. 'visual'-keyframing) */ void armature_loc_world_to_pose(Object *ob, const float inloc[3], float outloc[3]) @@ -1901,7 +1901,7 @@ static void splineik_init_tree_from_pchan(Scene *scene, Object *UNUSED(ob), bPos * proportion of the total length that each bone occupies */ for (i = 0; i < segcount; i++) { - /* 'head' joints, travelling towards the root of the chain + /* 'head' joints, traveling towards the root of the chain * - 2 methods; the one chosen depends on whether we've got usable lengths */ if ((ikData->flag & CONSTRAINT_SPLINEIK_EVENSPLITS) || (totLength == 0.0f)) { @@ -2078,14 +2078,14 @@ static void splineik_evaluate_bone(tSplineIK_Tree *tree, Scene *scene, Object *o float raxis[3], rangle; /* compute the raw rotation matrix from the bone's current matrix by extracting only the - * orientation-relevant axes, and normalising them + * orientation-relevant axes, and normalizing them */ copy_v3_v3(rmat[0], pchan->pose_mat[0]); copy_v3_v3(rmat[1], pchan->pose_mat[1]); copy_v3_v3(rmat[2], pchan->pose_mat[2]); normalize_m3(rmat); - /* also, normalise the orientation imposed by the bone, now that we've extracted the scale factor */ + /* also, normalize the orientation imposed by the bone, now that we've extracted the scale factor */ normalize_v3(splineVec); /* calculate smallest axis-angle rotation necessary for getting from the @@ -2255,7 +2255,7 @@ void pchan_to_mat4(bPoseChannel *pchan, float chan_mat[4][4]) /* quats are normalised before use to eliminate scaling issues */ float quat[4]; - /* NOTE: we now don't normalise the stored values anymore, since this was kindof evil in some cases + /* NOTE: we now don't normalize the stored values anymore, since this was kindof evil in some cases * but if this proves to be too problematic, switch back to the old system of operating directly on * the stored copy */ diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index c66b8da0dcd..d0e01c4fde6 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -1910,7 +1910,7 @@ static void samevolume_evaluate (bConstraint *con, bConstraintOb *cob, ListBase mat4_to_size(obsize, cob->matrix); - /* calculate normalising scale factor for non-essential values */ + /* calculate normalizing scale factor for non-essential values */ if (obsize[data->flag] != 0) fac = sqrtf(volume / obsize[data->flag]) / obsize[data->flag]; diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 9e4762a2dbe..708bf288cc2 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -745,7 +745,7 @@ static void surfaceGenerateGrid(struct DynamicPaintSurface *surface) grid->t_index = MEM_callocN(sizeof(int) * sData->total_points, "Surface Grid Target Ids"); temp_t_index = MEM_callocN(sizeof(int) * sData->total_points, "Temp Surface Grid Target Ids"); - /* in case of an allocation failture abort here */ + /* in case of an allocation failure abort here */ if (!grid->bounds || !grid->s_pos || !grid->s_num || !grid->t_index || !temp_s_num || !temp_t_index) error = 1; diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index 163c3721dc8..b06cc8414a6 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -379,7 +379,7 @@ void IDP_ConcatString(IDProperty *str1, IDProperty *append) int newlen; /* since ->len for strings includes the NULL byte, we have to subtract one or - * we'll get an extra null byte after each concatination operation.*/ + * we'll get an extra null byte after each concatenation operation.*/ newlen = str1->len + append->len - 1; IDP_ResizeArray(str1, newlen); strcat(str1->data.pointer, append->data.pointer); diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 5c5fe2f4156..84939925b00 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -1177,7 +1177,7 @@ static void icu_to_fcurves (ID *id, ListBase *groups, ListBase *list, IpoCurve * case IPO_CYCLX: /* cyclic extrapolation + offset */ { /* Add a new FModifier (Cyclic) instead of setting extend value - * as that's the new equivilant of that option. + * as that's the new equivalent of that option. */ FModifier *fcm= add_fmodifier(&fcu->modifiers, FMODIFIER_TYPE_CYCLES); FMod_Cycles *data= (FMod_Cycles *)fcm->data; diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 0b4b6d164ce..6c05ecb33ff 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -1579,7 +1579,7 @@ KeyBlock *key_get_named_keyblock(Key *key, const char name[]) } /* Get RNA-Path for 'value' setting of the given ShapeKey - * NOTE: the user needs to free the returned string once they're finishe with it + * NOTE: the user needs to free the returned string once they're finish with it */ char *key_get_curValue_rnaPath(Key *key, KeyBlock *kb) { diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index ee4f3d1701e..ad8b7411709 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -1277,7 +1277,7 @@ static int distribute_threads_init_data(ParticleThread *threads, Scene *scene, D MEM_freeN(element_sum); - /* For hair, sort by origindex (allows optimizations in rendering), */ + /* For hair, sort by origindex (allows optimization's in rendering), */ /* however with virtual parents the children need to be in random order. */ if(part->type == PART_HAIR && !(part->childtype==PART_CHILD_FACES && part->parents!=0.0f)) { COMPARE_ORIG_INDEX = NULL; diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index efc3477298c..a98834c5e35 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -86,7 +86,7 @@ typedef void ( *Shrinkwrap_ForeachVertexCallback) (DerivedMesh *target, float *co, float *normal); /* get derived mesh */ -//TODO is anyfunction that does this? returning the derivedFinal witouth we caring if its in edit mode or not? +//TODO is anyfunction that does this? returning the derivedFinal without we caring if its in edit mode or not? DerivedMesh *object_get_derived_final(Object *ob) { Mesh *me= ob->data; |