diff options
95 files changed, 137 insertions, 147 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; diff --git a/source/blender/blenlib/BLI_blenlib.h b/source/blender/blenlib/BLI_blenlib.h index c802b083f1f..74b477bacaf 100644 --- a/source/blender/blenlib/BLI_blenlib.h +++ b/source/blender/blenlib/BLI_blenlib.h @@ -44,7 +44,7 @@ * \subsection issues Known issues with BLI * * - blenlib is written in C. - * - The posix-compliancy may move to a separate lib that deals with + * - The posix-compliance may move to a separate lib that deals with * platform dependencies. (There are other platform-dependent * fixes as well.) * - The file i/o has some redundant code. It should be cleaned. diff --git a/source/blender/blenlib/BLI_pbvh.h b/source/blender/blenlib/BLI_pbvh.h index f60f8d90b09..85dd1c1a197 100644 --- a/source/blender/blenlib/BLI_pbvh.h +++ b/source/blender/blenlib/BLI_pbvh.h @@ -159,7 +159,7 @@ typedef struct PBVHVertexIter { int *vert_indices; /* result: these are all computed in the macro, but we assume - * that compiler optimizations will skip the ones we don't use */ + * that compiler optimization's will skip the ones we don't use */ struct MVert *mvert; float *co; short *no; diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index 1c0bac4a82f..1876a625bc3 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -719,7 +719,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 reason is that we can build level N+1 from level N witouth any data dependencies.. thus it allows + * The reason is that we can build level N+1 from level N without any data dependencies.. thus it allows * to use multithread building. * * To archieve this is necessary to find how much leafs are accessible from a certain branch, BVHBuildHelper @@ -1501,7 +1501,7 @@ static void dfs_raycast(BVHRayCastData *data, BVHNode *node) //ray-bv is really fast.. and simple tests revealed its worth to test it //before calling the ray-primitive functions - /* XXX: temporary solution for particles untill fast_ray_nearest_hit supports ray.radius */ + /* XXX: temporary solution for particles until fast_ray_nearest_hit supports ray.radius */ float dist = (data->ray.radius > 0.0f) ? ray_nearest_hit(data, node->bv) : fast_ray_nearest_hit(data, node); if(dist >= data->hit.dist) return; diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c index b3ce4ba88d4..d728f49c3cd 100644 --- a/source/blender/blenlib/intern/math_rotation.c +++ b/source/blender/blenlib/intern/math_rotation.c @@ -711,7 +711,7 @@ void axis_angle_to_mat3(float mat[3][3], const float axis[3], const float angle) { float nor[3], nsi[3], co, si, ico; - /* normalise the axis first (to remove unwanted scaling) */ + /* normalize the axis first (to remove unwanted scaling) */ if(normalize_v3_v3(nor, axis) == 0.0f) { unit_m3(mat); return; @@ -1421,7 +1421,7 @@ void eulO_to_gimbal_axis(float gmat[][3], const float eul[3], const short order) * \author Ladislav Kavan, kavanl@cs.tcd.ie * * Changes for Blender: - * - renaming, style changes and optimizations + * - renaming, style changes and optimization's * - added support for scaling */ diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 41a73aaf4ba..54a865c7c22 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -730,7 +730,7 @@ int BLI_path_abs(char *path, const char *basepath) /* * Should only be done with command line paths. - * this is NOT somthing blenders internal paths support like the // prefix + * this is NOT something blenders internal paths support like the // prefix */ int BLI_path_cwd(char *path) { diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index fafddaa544f..81e9cbbde9d 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -10089,7 +10089,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } if ((main->versionfile < 245) || (main->versionfile == 245 && main->subversionfile < 5)) { - /* foreground color needs to be somthing other then black */ + /* foreground color needs to be something other then black */ Scene *sce; for(sce= main->scene.first; sce; sce=sce->id.next) { sce->r.fg_stamp[0] = sce->r.fg_stamp[1] = sce->r.fg_stamp[2] = 0.8f; diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index ae1f308369d..f15ce721081 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -2399,7 +2399,7 @@ static bAnimChannelType ACF_GPD = /* GPencil Layer ------------------------------------------- */ -/* name for grase pencil layer entries */ +/* name for grease pencil layer entries */ static void acf_gpl_name(bAnimListElem *ale, char *name) { bGPDlayer *gpl = (bGPDlayer *)ale->data; diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index fc8947a2a58..74ae587218b 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -1985,7 +1985,7 @@ static void rename_anim_channels (bAnimContext *ac, int channel_index) if (acf->name_prop(ale, &ptr, &prop)) { /* actually showing the rename textfield is done on redraw, * so here we just store the index of this channel in the - * dopesheet data, which will get utilised when drawing the + * dopesheet data, which will get utilized when drawing the * channel... * * +1 factor is for backwards compat issues diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 4858fbf4f85..81836d83b95 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1285,7 +1285,7 @@ static size_t animdata_filter_gpencil_data (ListBase *anim_data, bGPdata *gpd, i return items; } -/* Grab all Grase Pencil datablocks in file */ +/* Grab all Grease Pencil datablocks in file */ // TODO: should this be amalgamated with the dopesheet filtering code? static size_t animdata_filter_gpencil (ListBase *anim_data, void *UNUSED(data), int filter_mode) { diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index a99276db122..f140c408e68 100644 --- a/source/blender/editors/animation/keyframes_edit.c +++ b/source/blender/editors/animation/keyframes_edit.c @@ -70,7 +70,7 @@ * which take the data they operate on, a few callbacks defining what operations to perform. * * As operators which work on keyframes usually apply the same operation on all BezTriples in - * every channel, the code has been optimised providing a set of functions which will get the + * every channel, the code has been optimized providing a set of functions which will get the * appropriate bezier-modify function to set. These functions (ANIM_editkeyframes_*) will need * to be called before getting any channels. * diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 8bb29c3c41c..161f549e257 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -375,7 +375,7 @@ enum { /* This helper function determines whether a new keyframe is needed */ /* Cases where keyframes should not be added: - * 1. Keyframe to be added bewteen two keyframes with similar values + * 1. Keyframe to be added between two keyframes with similar values * 2. Keyframe to be added on frame where two keyframes are already situated * 3. Keyframe lies at point that intersects the linear line between two keyframes */ diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 357a53eacb3..6a128abea18 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -4738,7 +4738,7 @@ void create_vgroups_from_armature(ReportList *reports, Scene *scene, Object *ob, if(mode == ARM_GROUPS_NAME) { /* Traverse the bone list, trying to create empty vertex - * groups cooresponding to the bone. + * groups corresponding to the bone. */ bone_looper(ob, arm->bonebase.first, NULL, vgroup_add_unique_bone_cb); diff --git a/source/blender/editors/armature/poseSlide.c b/source/blender/editors/armature/poseSlide.c index 8698ac00913..f160e74ea03 100644 --- a/source/blender/editors/armature/poseSlide.c +++ b/source/blender/editors/armature/poseSlide.c @@ -939,7 +939,7 @@ static float pose_propagate_get_boneHoldEndFrame (Object *ob, tPChanFCurveLink * LinkData *ld; float endFrame = startFrame; - /* set up optimised data-structures for searching for relevant keyframes + holds */ + /* set up optimized data-structures for searching for relevant keyframes + holds */ BLI_dlrbTree_init(&keys); BLI_dlrbTree_init(&blocks); diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index 0d1a7c7173b..282519896c7 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -755,7 +755,7 @@ static void pose_copy_menu(Scene *scene) pchanact= pchan; arm= ob->data; - /* if proxy-protected bones selected, some things (such as locks + displays) shouldn't be changable, + /* if proxy-protected bones selected, some things (such as locks + displays) shouldn't be changeable, * but for constraints (just add local constraints) */ if (pose_has_protected_selected(ob, 0)) { diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 28e29bf0a8c..def93798067 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -1116,9 +1116,9 @@ static void curve_rename_fcurves(Object *obedit, ListBase *orig_curves) nu_index++; } - /* remove pathes for removed control points + /* remove paths for removed control points * need this to make further step with copying non-cv related curves copying - * not touching cv's f-cruves */ + * not touching cv's f-curves */ for(fcu= orig_curves->first; fcu; fcu= next) { next= fcu->next; @@ -1261,7 +1261,7 @@ void make_editNurb(Object *obedit) if(actkey) editnurb->shapenr= obedit->shapenr; - /* animation could be added in editmode even if teher was no animdata i + /* animation could be added in editmode even if there was no animdata i * object mode hence we always need CVs index be created */ init_editNurb_keyIndex(editnurb, &cu->nurb); } @@ -1416,7 +1416,7 @@ void CURVE_OT_separate(wmOperatorType *ot) static short isNurbselUV(Nurb *nu, int *u, int *v, int flag) { /* return u!=-1: 1 row in u-direction selected. U has value between 0-pntsv - * return v!=-1: 1 collumn in v-direction selected. V has value between 0-pntsu + * return v!=-1: 1 column in v-direction selected. V has value between 0-pntsu */ BPoint *bp; int a, b, sel; @@ -1772,7 +1772,7 @@ static short extrudeflagNurb(EditNurb *editnurb, int flag) nu->pntsv++; nurbs_knot_calc_v(nu); } - else if(v==0 || v== nu->pntsu-1) { /* collumn in v-direction selected */ + else if(v==0 || v== nu->pntsu-1) { /* column in v-direction selected */ ok= 1; bpn = newbp = (BPoint*) MEM_mallocN((nu->pntsu + 1) * nu->pntsv * sizeof(BPoint), "extrudeNurb1"); @@ -3778,7 +3778,7 @@ static void merge_2_nurb(wmOperator *op, ListBase *editnurb, Nurb *nu1, Nurb *nu return; } - /* ok, now nu1 has the rightmost collumn and nu2 the leftmost collumn selected */ + /* ok, now nu1 has the rightmost column and nu2 the leftmost column selected */ /* maybe we need a 'v' flip of nu2? */ bp1= nu1->bp+nu1->pntsu-1; diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index c9d1f70aa65..84d3162434a 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -578,7 +578,7 @@ static void gp_stroke_newfrombuffer (tGPsdata *p) } /* special case for poly line -- for already added stroke during session - * coordinates are getting added to stroke immediatelly to allow more + * coordinates are getting added to stroke immediately to allow more * interactive behavior */ if (p->paintmode == GP_PAINTMODE_DRAW_POLY) { if (p->flags & GP_PAINTFLAG_STROKEADDED) diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h index d0d50aa86fa..d75fac18c8c 100644 --- a/source/blender/editors/include/BIF_glutil.h +++ b/source/blender/editors/include/BIF_glutil.h @@ -116,7 +116,7 @@ void glaRasterPosSafe2f (float x, float y, float known_good_x, float known_good * (0.375, 0.375) is assumed to be within the view frustum, and the * modelview and projection matrices are assumed to define a * 1-to-1 mapping to screen space. - * \attention Furthmore, in the case of zoomed or unpixel aligned + * \attention Furthermore, in the case of zoomed or unpixel aligned * images extending outside the view frustum, but still within the * window, some portion of the image may be visible left and/or * below of the given \a x and \a y coordinates. It is recommended diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index c40048625a7..17a06bbb9ac 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -263,16 +263,6 @@ void ED_vgroup_vert_add(struct Object *ob, struct bDeformGroup *dg, int vertnum void ED_vgroup_vert_remove(struct Object *ob, struct bDeformGroup *dg, int vertnum); float ED_vgroup_vert_weight(struct Object *ob, struct bDeformGroup *dg, int vertnum); -/** - * findnearestvert - * - * dist (in/out): minimal distance to the nearest and at the end, actual distance - * sel: selection bias - * if SELECT, selected vertice are given a 5 pixel bias to make them farter than unselect verts - * if 0, unselected vertice are given the bias - * strict: if 1, the vertice corresponding to the sel parameter are ignored and not just biased - */ - struct BMVert *EDBM_findnearestvert(struct ViewContext *vc, int *dist, short sel, short strict); struct BMEdge *EDBM_findnearestedge(struct ViewContext *vc, int *dist); struct BMFace *EDBM_findnearestface(struct ViewContext *vc, int *dist); diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 6e3e7a2a4e0..f15de857549 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -456,7 +456,7 @@ static int ui_but_float_precision(uiBut *but, double value) prec= (but->hardmax < 10.001f) ? 3 : 2; } - /* check on the number of decimal places neede to display + /* check on the number of decimal places need to display * the number, this is so 0.00001 is not displayed as 0.00, * _but_, this is only for small values si 10.0001 will not get * the same treatment */ @@ -2373,7 +2373,7 @@ static void ui_block_do_align_but(uiBut *first, short nr) } } - /* rows==0: 1 row, cols==0: 1 collumn */ + /* rows==0: 1 row, cols==0: 1 column */ /* note; how it uses 'flag' in loop below (either set it, or OR it) is confusing */ for(but=first, prev=NULL; but && but->alignnr == nr; prev=but, but=but->next) { diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index f1d4d6b7277..cc30cda78be 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -3038,7 +3038,7 @@ static int ui_do_but_BLOCK(bContext *C, uiBut *but, uiHandleButtonData *data, wm * to cancel changes made to this button, but changing state to EXIT also makes no button active for * a while which leads to triggering operator when doing fast scrolling mouse wheel. * using post activate stuff from button allows to make button be active again after checking for all - * all that mouse leave and cancel stuff, so wuick scrool wouldnt't be an issue anumore. + * all that mouse leave and cancel stuff, so quick scroll wouldnt't be an issue anymore. * same goes for scrolling wheel in another direction below (sergey) */ data->postbut= but; diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index 0521ecbf0d0..5ca3f730006 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -487,7 +487,7 @@ static void UI_OT_reports_to_textblock(wmOperatorType *ot) /* ------------------------------------------------------------------------- */ /* EditSource Utility funcs and operator, - * note, this includes itility functions and button matching checks */ + * note, this includes utility functions and button matching checks */ struct uiEditSourceStore { uiBut but_orig; diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index 769087b73ef..b1099576505 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -641,7 +641,7 @@ typedef struct PanelSort { /* note about sorting; * the sortorder has a lower value for new panels being added. * however, that only works to insert a single panel, when more new panels get - * added the coordinates of existing panels and the previously stored to-be-insterted + * added the coordinates of existing panels and the previously stored to-be-inserted * panels do not match for sorting */ static int find_leftmost_panel(const void *a1, const void *a2) diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c index b9c29888a64..65e2b98f4b9 100644 --- a/source/blender/editors/interface/interface_style.c +++ b/source/blender/editors/interface/interface_style.c @@ -66,7 +66,7 @@ * "Header", or "Listview" or "Toolbar". Properties of Style definitions * are: * - * - default collumn properties, internal spacing, aligning, min/max width + * - default column properties, internal spacing, aligning, min/max width * - button alignment rules (for groups) * - label placement rules * - internal labeling or external labeling default diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index e8d4cba81c8..e539c02ee17 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -981,7 +981,7 @@ void UI_view2d_view_ortho(View2D *v2d) float xofs, yofs; /* pixel offsets (-0.375f) are needed to get 1:1 correspondence with pixels for smooth UI drawing, - * but only applied where requsted + * but only applied where requested */ /* XXX brecht: instead of zero at least use a tiny offset, otherwise * pixel rounding is effectively random due to float inaccuracy */ @@ -1020,7 +1020,7 @@ void UI_view2d_view_orthoSpecial(ARegion *ar, View2D *v2d, short xaxis) float xofs, yofs; /* pixel offsets (-0.375f) are needed to get 1:1 correspondence with pixels for smooth UI drawing, - * but only applied where requsted + * but only applied where requested */ /* XXX temp (ton) */ xofs= 0.0f; // (v2d->flag & V2D_PIXELOFS_X) ? 0.375f : 0.0f; diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 029ca50db5b..49dae81d985 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -1126,7 +1126,7 @@ static int view_borderzoom_exec(bContext *C, wmOperator *op) } else /* if (gesture_mode == GESTURE_MODAL_OUT) */ { /* zoom out: - * - the current 'cur' rect coordinates are going to end upwhere the 'rect' ones are, + * - the current 'cur' rect coordinates are going to end up where the 'rect' ones are, * but the 'cur' rect coordinates will need to be adjusted to take in more of the view * - calculate zoom factor, and adjust using center-point */ diff --git a/source/blender/editors/mesh/bmesh_select.c b/source/blender/editors/mesh/bmesh_select.c index fd6242fb209..3ee365d046e 100644 --- a/source/blender/editors/mesh/bmesh_select.c +++ b/source/blender/editors/mesh/bmesh_select.c @@ -365,7 +365,7 @@ static unsigned int findnearestvert__backbufIndextest(void *handle, unsigned int * * dist (in/out): minimal distance to the nearest and at the end, actual distance * sel: selection bias - * if SELECT, selected vertice are given a 5 pixel bias to make them farter than unselect verts + * if SELECT, selected vertice are given a 5 pixel bias to make them further than unselect verts * if 0, unselected vertice are given the bias * strict: if 1, the vertice corresponding to the sel parameter are ignored and not just biased */ diff --git a/source/blender/editors/mesh/bmesh_utils.c b/source/blender/editors/mesh/bmesh_utils.c index 5fb0966b107..758f3010b84 100644 --- a/source/blender/editors/mesh/bmesh_utils.c +++ b/source/blender/editors/mesh/bmesh_utils.c @@ -960,7 +960,7 @@ void EDBM_free_uv_element_map(UvElementMap *element_map) } /* last_sel, use em->act_face otherwise get the last selected face in the editselections - * at the moment, last_sel is mainly useful for gaking sure the space image dosnt flicker */ + * at the moment, last_sel is mainly useful for making sure the space image dosnt flicker */ MTexPoly *EDBM_get_active_mtexpoly(BMEditMesh *em, BMFace **r_act_efa, int sloppy) { BMFace *efa = NULL; diff --git a/source/blender/editors/mesh/knifetool.c b/source/blender/editors/mesh/knifetool.c index 3b78ceada98..872ab528276 100644 --- a/source/blender/editors/mesh/knifetool.c +++ b/source/blender/editors/mesh/knifetool.c @@ -1569,7 +1569,7 @@ static int knife_update_active(knifetool_opdata *kcd) /* if no hits are found this would normally default to (0,0,0) so instead * get a point at the mouse ray closest to the previous point. * Note that drawing lines in `free-space` isn't properly supported - * but theres no guarantee (0,0,0) has any geometry either - campell */ + * but theres no guarantee (0,0,0) has any geometry either - campbell */ if (kcd->curvert == NULL && kcd->curedge == NULL) { float origin[3], ray[3], co[3]; diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index e9c1bd4047e..1287d903020 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -465,7 +465,7 @@ int mouse_mball(bContext *C, const int mval[2], int extend) } /* When some metaelem was found, then it is necessary to select or - * deselet it. */ + * deselect it. */ if(act) { if(extend==0) { /* Deselect all existing metaelems */ diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 11ceda8a61f..385eb1be656 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -453,7 +453,7 @@ void ED_object_enter_editmode(bContext *C, int flag) /* * The function object_data_is_libdata make a problem here, the * check for ob->proxy return 0 and let blender enter to edit mode - * this causa a crash when you try leave the edit mode. + * this causes a crash when you try leave the edit mode. * The problem is that i can't remove the ob->proxy check from * object_data_is_libdata that prevent the bugfix #6614, so * i add this little hack here. diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index bda373dd441..d78b6675eea 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -450,7 +450,7 @@ static int modifier_apply_shape(ReportList *reports, Scene *scene, Object *ob, M * It should be ridiculously easy to extract the original verts that we want * and form the shape data. We can probably use the CD KEYINDEX layer (or * whatever I ended up calling it, too tired to check now), though this would - * by necassity have to make some potentially ugly assumptions about the order + * by necessity have to make some potentially ugly assumptions about the order * of the mesh data :-/ you can probably assume in 99% of cases that the first * element of a given index is the original, and any subsequent duplicates are * copies/interpolates, but that's an assumption that would need to be tested diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 4377aad0c42..9e11146db70 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -492,7 +492,7 @@ static short select_grouped_object_hooks(bContext *C, Object *ob) return changed; } -/* Select objects woth the same parent as the active (siblings), +/* Select objects with the same parent as the active (siblings), * parent can be NULL also */ static short select_grouped_siblings(bContext *C, Object *ob) { diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index be41f08df8e..d66f16b0adb 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -118,7 +118,7 @@ static void object_clear_rot(Object *ob) if ((ob->protectflag & OB_LOCK_ROTZ) == 0) ob->quat[3]= ob->dquat[3]= 0.0f; - // TODO: does this quat need normalising now? + // TODO: does this quat need normalizing now? } else { /* the flag may have been set for the other modes, so just ignore the extra flag... */ diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index b545598f240..b0a3518b03a 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -1604,7 +1604,7 @@ void ED_vgroup_mirror(Object *ob, const short mirror_weights, const short flip_v goto cleanup; } - /* unlike editmesh we know that by only looping over the first hald of + /* unlike editmesh we know that by only looping over the first half of * the 'u' indices it will cover all points except the middle which is * ok in this case */ pntsu_half= lt->pntsu / 2; @@ -2151,7 +2151,7 @@ void OBJECT_OT_vertex_group_assign(wmOperatorType *ot) /* flags */ /* redo operator will fail in this case because vertex group assignment * isn't stored in local edit mode stack and toggling "new" property will - * lead to creating plenty of new veretx groups (see [#29527], sergey) */ + * lead to creating plenty of new vertex groups (see [#29527], sergey) */ ot->flag= /*OPTYPE_REGISTER|*/OPTYPE_UNDO; /* properties */ @@ -2191,7 +2191,7 @@ void OBJECT_OT_vertex_group_remove_from(wmOperatorType *ot) ot->exec= vertex_group_remove_from_exec; /* flags */ - /* redo operator will fail in this case because vertex groups ssignment + /* redo operator will fail in this case because vertex groups assignment * isn't stored in local edit mode stack and toggling "all" property will lead to * removing vertices from all groups (see [#29527], sergey) */ ot->flag= /*OPTYPE_REGISTER|*/OPTYPE_UNDO; diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c index 4e9145a6ff3..b6584122f3a 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.c +++ b/source/blender/editors/physics/dynamicpaint_ops.c @@ -269,7 +269,7 @@ void DPAINT_OT_output_toggle(wmOperatorType *ot) /* * Do actual bake operation. Loop through to-be-baked frames. - * Returns 0 on failture. + * Returns 0 on failure. */ static int dynamicPaint_bakeImageSequence(bContext *C, DynamicPaintSurface *surface, Object *cObject) { diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 8201b27a4ed..3cc7c8a944e 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -191,7 +191,7 @@ ParticleEditSettings *PE_settings(Scene *scene) return scene->toolsettings ? &scene->toolsettings->particle : NULL; } -/* always gets atleast the first particlesystem even if PSYS_CURRENT flag is not set +/* always gets at least the first particlesystem even if PSYS_CURRENT flag is not set * * note: this function runs on poll, therefor it can runs many times a second * keep it fast! */ diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 6f846b82c5f..2f9ee407a6a 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1659,7 +1659,7 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char * y= -y; } else { - /* for now, allow scrolling in both directions (since layouts are optimised for vertical, + /* for now, allow scrolling in both directions (since layouts are optimized for vertical, * they often don't fit in horizontal layout) */ v2d->keepofs &= ~(V2D_LOCKOFS_X|V2D_LOCKOFS_Y|V2D_KEEPOFS_X|V2D_KEEPOFS_Y); diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 94d1f3c6a81..5504434e6b5 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -2864,7 +2864,7 @@ static int match_region_with_redraws(int spacetype, int regiontype, int redraws) /* Track Preview button is on Properties Editor in SpaceClip, * and it's very common case when users want it be refreshing * during playback, so asking people to enable special option - * for this is a bit ticky, so add exception here for refreshing + * for this is a bit tricky, so add exception here for refreshing * Properties Editor for SpaceClip always */ return 1; } diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 1d84a0aca8e..dcd89a52a80 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -825,7 +825,7 @@ static int sample_backbuf_area(ViewContext *vc, int *indexar, int totface, int x struct ImBuf *ibuf; int a, tot=0, index; - /* brecht: disabled this because it obviously failes for + /* brecht: disabled this because it obviously fails for * brushes with size > 64, why is this here? */ /*if(size>64.0) size= 64.0;*/ diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 7c3d8f0e9cd..b5ecff74448 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -274,7 +274,7 @@ static int sculpt_get_redraw_rect(ARegion *ar, RegionView3D *rv3d, * needed here (not in sculpt_flush_update) as it was before * because redraw rectangle should be the same in both of * optimized PBVH draw function and 3d view redraw (if not -- some - * mesh parts could disapper from screen (sergey) */ + * mesh parts could disappear from screen (sergey) */ ss = ob->sculpt; if(ss->cache) { if(!BLI_rcti_is_empty(&ss->cache->previous_r)) diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index af2db9697b2..e99d5919cd4 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -850,7 +850,7 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip, /* UI_view2d_to_region_no_clip return integer values, this could * lead to 1px flickering when view is locked to selection during playbeck. - * to avoid this flickering, calclate base point in the same way as it happens + * to avoid this flickering, calculate base point in the same way as it happens * in UI_view2d_to_region_no_clip, but do it in floats here */ view2d_to_region_float(&ar->v2d, 0.0f, 0.0f, &x, &y); @@ -1317,7 +1317,7 @@ void clip_draw_grease_pencil(bContext *C, int onlyv2d) return; if(onlyv2d) { - /* if manual calibration is used then grase pencil data is already + /* if manual calibration is used then grease pencil data is already * drawed in draw_distortion */ if((sc->flag&SC_MANUAL_CALIBRATION)==0 || sc->mode!=SC_MODE_DISTORTION) { ibuf= ED_space_clip_get_buffer(sc); diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index 0b5cfbbc7d3..00b997ba190 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -724,7 +724,7 @@ static void clip_main_area_draw(const bContext *C, ARegion *ar) Scene *scene= CTX_data_scene(C); MovieClip *clip= ED_space_clip(sc); - /* if trcking is in progress, we should sunchronize framenr from clipuser + /* if tracking is in progress, we should sunchronize framenr from clipuser * so latest tracked frame would be shown */ if(clip && clip->tracking_context) BKE_tracking_sync_user(&sc->user, clip->tracking_context); diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index a88296a9729..681c33da02c 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -1327,7 +1327,7 @@ static int track_markers_initjob(bContext *C, TrackMarkersJob *tmj, int backward tmj->lastfra= tmj->sfra; - /* XXX: silly to store this, but this data is needed to update scene and movieclip + /* XXX: silly to store this, but this data is needed to update scene and movie-clip * frame numbers when tracking is finished. This introduces better feedback for artists. * Maybe there's another way to solve this problem, but can't think better way atm. * Anyway, this way isn't more unstable as animation rendering animation diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index 2307f1db4f2..e44f1abd262 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -193,7 +193,7 @@ void GRAPH_OT_select_all_toggle (wmOperatorType *ot) */ /* Borderselect only selects keyframes now, as overshooting handles often get caught too, - * which means that they may be inadvertantly moved as well. However, incl_handles overrides + * which means that they may be inadvertently moved as well. However, incl_handles overrides * this, and allow handles to be considered independently too. * Also, for convenience, handles should get same status as keyframe (if it was within bounds). */ diff --git a/source/blender/editors/space_graph/graph_utils.c b/source/blender/editors/space_graph/graph_utils.c index 8925866df8d..8c2afe8a242 100644 --- a/source/blender/editors/space_graph/graph_utils.c +++ b/source/blender/editors/space_graph/graph_utils.c @@ -122,7 +122,7 @@ int graphop_visible_keyframes_poll (bContext *C) for (ale = anim_data.first; ale; ale= ale->next) { FCurve *fcu= (FCurve *)ale->data; - /* visible curves for selection must fulfull the following criteria: + /* visible curves for selection must fulfill the following criteria: * - it has bezier keyframes * - F-Curve modifiers do not interfere with the result too much * (i.e. the modifier-control drawing check returns false) @@ -171,7 +171,7 @@ int graphop_editable_keyframes_poll (bContext *C) for (ale = anim_data.first; ale; ale= ale->next) { FCurve *fcu= (FCurve *)ale->data; - /* editable curves must fulfull the following criteria: + /* editable curves must fulfill the following criteria: * - it has bezier keyframes * - it must not be protected from editing (this is already checked for with the foredit flag * - F-Curve modifiers do not interfere with the result too much diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index ea593b57ee0..26c56e9948f 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -1461,7 +1461,7 @@ static short draw_sensorbuttons(Object *ob, bSensor *sens, uiBlock *block, short * proper compatibility with older .blend files. */ /* Any sensor type default is 0 but the ms enum starts in 1. - * Therefore the mosue sensor is initialized to 1 in sca.c */ + * Therefore the mouse sensor is initialized to 1 in sca.c */ str= "Type %t|Left button %x1|Middle button %x2|" "Right button %x4|Wheel Up %x5|Wheel Down %x6|Movement %x8|Mouse over %x16|Mouse over any%x32"; uiDefButS(block, MENU, B_REDR, str, xco+10, yco-44, (width*0.8f)-20, 19, @@ -4716,7 +4716,7 @@ static void logic_buttons_new(bContext *C, ARegion *ar) /* put link button to the right */ col = uiLayoutColumn(split, 0); - /* use oldskool uiButtons for links for now */ + /* use old-school uiButtons for links for now */ but= uiDefIconBut(block, LINK, 0, ICON_LINK, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0, 0, 0, 0, ""); uiSetButLink(but, NULL, (void ***)&(sens->links), &sens->totlinks, LINK_SENSOR, LINK_CONTROLLER); } diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index bb99464e3c7..dd22d90d148 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -1972,7 +1972,7 @@ static bNodeSocket *best_socket_output(bNodeTree *ntree, bNode *node, bNodeSocke return NULL; } -/* this is a bit complicated, but designed to prioritise finding +/* this is a bit complicated, but designed to prioritize finding * sockets of higher types, such as image, first */ static bNodeSocket *best_socket_input(bNodeTree *ntree, bNode *node, int num, int replace) { diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 1a08df79664..f0115170525 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -894,7 +894,7 @@ struct DrawIconArg { static void tselem_draw_icon_uibut(struct DrawIconArg *arg, int icon) { - /* restrict collumn clip... it has been coded by simply overdrawing, doesnt work for buttons */ + /* restrict column clip... it has been coded by simply overdrawing, doesnt work for buttons */ if(arg->x >= arg->xmax) { glEnable(GL_BLEND); UI_icon_draw_aspect(arg->x, arg->y, icon, 1.0f, arg->alpha); diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 84ae948f275..96e837eb95b 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -701,7 +701,7 @@ static int sequencer_add_effect_strip_invoke(bContext *C, wmOperator *op, wmEven type= RNA_enum_get(op->ptr, "type"); /* when invoking an effect strip which uses inputs, - * skip initialzing the channel from the mouse. + * skip initializing the channel from the mouse. * Instead leave the property unset so exec() initializes it to be * above the strips its applied to. */ if(get_sequence_effect_num_inputs(type) != 0) { diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index f05068cac59..2815297eb13 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -2913,7 +2913,7 @@ static int sequencer_change_effect_type_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - /* can someone explain the logic behind only allowing to increse this, + /* can someone explain the logic behind only allowing to increase this, * copied from 2.4x - campbell */ if (get_sequence_effect_num_inputs(seq->type) < get_sequence_effect_num_inputs(new_type) diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index dec1abfd009..a6bc0d9612a 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -1113,7 +1113,7 @@ static void calc_text_rcts(SpaceText *st, ARegion *ar, rcti *scroll, rcti *back) scroll->ymin= 4; scroll->ymax= 4+pix_available; - /* when resizing a vieport with the bar at the bottom to a greater height more blank lines will be added */ + /* when resizing a view-port with the bar at the bottom to a greater height more blank lines will be added */ if(ltexth + blank_lines < st->top + st->viewlines) { blank_lines = st->top + st->viewlines - ltexth; } diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 2ab8ec8aa99..2596ba3f4bc 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -356,7 +356,7 @@ static float cube[8][3] = { { 1.0, 1.0, -1.0}, }; -/* ----------------- OpenGL Circle Drawing - Tables for Optimised Drawing Speed ------------------ */ +/* ----------------- OpenGL Circle Drawing - Tables for Optimized Drawing Speed ------------------ */ /* 32 values of sin function (still same result!) */ #define CIRCLE_RESOL 32 @@ -750,7 +750,7 @@ static void drawcentercircle(View3D *v3d, RegionView3D *rv3d, const float co[3], float verts[CIRCLE_RESOL][3]; /* using gldepthfunc guarantees that it does write z values, - * but not checks for it, so centers remain visible independt order of drawing */ + * but not checks for it, so centers remain visible independent order of drawing */ if (v3d->zbuf) glDepthFunc(GL_ALWAYS); glEnable(GL_BLEND); @@ -1057,7 +1057,7 @@ static void spotvolume(float lvec[3], float vvec[3], const float inp) plane[1]= 1.0f; /* now we've got two equations: one of a cone and one of a plane, but we have - * three unknowns. We remove one unkown by rotating the plane to z=0 (the plane normal) */ + * three unknowns. We remove one unknown by rotating the plane to z=0 (the plane normal) */ /* rotate around cross product vector of (0,0,1) and plane normal, dot product degrees */ /* according definition, we derive cross product is (plane[1],-plane[0],0), en cos = plane[2]);*/ @@ -2819,7 +2819,7 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS if (me->drawflag & ME_DRAWEXTRA_FACEAREA) { /* would be nice to use BM_face_area_calc, but that is for 2d faces - * so instead add up tessalation triangle areas */ + * so instead add up tessellationf triangle areas */ BMFace *f; int n; diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index f9ee50387d1..a9521a61eb2 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -980,7 +980,7 @@ static void v3d_posearmature_buts(uiLayout *layout, Object *ob) col = uiLayoutColumn(layout, 0); /* XXX: RNA buts show data in native types (i.e. quats, 4-component axis/angle, etc.) - * but oldskool UI shows in eulers always. Do we want to be able to still display in Eulers? + * but old-school UI shows in eulers always. Do we want to be able to still display in Eulers? * Maybe needs RNA/ui options to display rotations as different types... */ v3d_transform_butsR(col, &pchanptr); diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index f3945d1680c..8666a0085c3 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -3542,10 +3542,10 @@ int ED_view3d_autodist_depth_seg(struct ARegion *ar, const int mval_sta[2], cons } /** - * Gets the view trasnformation from a camera + * Gets the view transformation from a camera * currently dosnt take camzoom into account * - * The dist is not modified for this function, if NULL its assimed zero + * The dist is not modified for this function, if NULL its assumed zero */ void ED_view3d_from_m4(float mat[][4], float ofs[3], float quat[4], float *dist) { diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 0ae2ae0a9d1..3218daf65c7 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -184,7 +184,7 @@ typedef struct FlyInfo { /* relative view axis locking - xlock, zlock * 0) disabled - * 1) enabled but not checking because mouse hasnt moved outside the margin since locking was checked an not needed + * 1) enabled but not checking because mouse hasn't moved outside the margin since locking was checked an not needed * when the mouse moves, locking is set to 2 so checks are done. * 2) mouse moved and checking needed, if no view altering is donem its changed back to 1 */ short xlock, zlock; @@ -583,7 +583,7 @@ static void flyEvent(FlyInfo *fly, wmEvent *event) /* implement WASD keys */ case FLY_MODAL_DIR_FORWARD: if (fly->speed < 0.0f) fly->speed= -fly->speed; /* flip speed rather than stopping, game like motion */ - else if (fly->axis==2) fly->speed += fly->grid; /* increse like mousewheel if were already + else if (fly->axis==2) fly->speed += fly->grid; /* increase like mousewheel if were already * moving in that difection*/ fly->axis= 2; break; diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index b3ec1676bfb..17f5ab68633 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -130,7 +130,7 @@ static void handle_view3d_lock(bContext *C) scene->layact= v3d->layact; scene->camera= v3d->camera; - /* not through notifiery, listener don't have context + /* not through notifier, listener don't have context * and non-open screens or spaces need to be updated too */ BKE_screen_view3d_main_sync(&bmain->screen, scene); diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 15b1dde500b..93cf656dea4 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -2520,7 +2520,7 @@ static void pose_circle_select(ViewContext *vc, int select, const int mval[2], f ED_view3d_init_mats_rv3d(vc->obact, vc->rv3d); /* for foreach's screen/vert projection */ /* check each PoseChannel... */ - // TODO: could be optimised at some point + // TODO: could be optimized at some point for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) { short sco1[2], sco2[2], didpoint=0; float vec[3]; @@ -2592,7 +2592,7 @@ static void armature_circle_select(ViewContext *vc, int select, const int mval[2 ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */ /* check each EditBone... */ - // TODO: could be optimised at some point + // TODO: could be optimized at some point for (ebone= arm->edbo->first; ebone; ebone=ebone->next) { short sco1[2], sco2[2], didpoint=0; float vec[3]; diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index ad6a73e51e1..a23a72262f5 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -5066,7 +5066,7 @@ int Mirror(TransInfo *t, const int UNUSED(mval[2])) char str[200]; /* - * OPTIMISATION: + * OPTIMIZATION: * This still recalcs transformation on mouse move * while it should only recalc on constraint change * */ diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index db5ec297cc1..a0e4c5897db 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -1041,7 +1041,7 @@ int getConstraintSpaceDimension(TransInfo *t) return n; /* - * Someone willing to do it criptically could do the following instead: + * Someone willing to do it cryptically could do the following instead: * * return t->con & (CON_AXIS0|CON_AXIS1|CON_AXIS2); * diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 9ed2b1953e5..93be921a2bd 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2286,7 +2286,7 @@ void flushTransNodes(TransInfo *t) /* *** SEQUENCE EDITOR *** */ -/* commented _only_ because the meta may have animaion data which +/* commented _only_ because the meta may have animation data which * needs moving too [#28158] */ #define SEQ_TX_NESTED_METAS @@ -2404,7 +2404,7 @@ static void UVsToTransData(SpaceImage *sima, TransData *td, TransData2D *td2d, f ED_space_image_uv_aspect(sima, &aspx, &aspy); /* uv coords are scaled by aspects. this is needed for rotations and - * proportional editing to be consistent with the stretchted uv coords + * proportional editing to be consistent with the stretched uv coords * that are displayed. this also means that for display and numinput, * and when the the uv coords are flushed, these are converted each time */ td2d->loc[0] = uv[0]*aspx; @@ -3175,7 +3175,7 @@ static void createTransActionData(bContext *C, TransInfo *t) for (ale= anim_data.first; ale; ale= ale->next) { AnimData *adt= ANIM_nla_mapping_get(&ac, ale); - /* convert current-frame to action-time (slightly less accurate, espcially under + /* convert current-frame to action-time (slightly less accurate, especially under * higher scaling ratios, but is faster than converting all points) */ if (adt) @@ -3231,7 +3231,7 @@ static void createTransActionData(bContext *C, TransInfo *t) AnimData *adt= ANIM_nla_mapping_get(&ac, ale); FCurve *fcu= (FCurve *)ale->key_data; - /* convert current-frame to action-time (slightly less accurate, espcially under + /* convert current-frame to action-time (slightly less accurate, especially under * higher scaling ratios, but is faster than converting all points) */ if (adt) @@ -3402,7 +3402,7 @@ static void createTransGraphEditData(bContext *C, TransInfo *t) AnimData *adt= ANIM_nla_mapping_get(&ac, ale); FCurve *fcu= (FCurve *)ale->key_data; - /* convert current-frame to action-time (slightly less accurate, espcially under + /* convert current-frame to action-time (slightly less accurate, especially under * higher scaling ratios, but is faster than converting all points) */ if (adt) @@ -3493,7 +3493,7 @@ static void createTransGraphEditData(bContext *C, TransInfo *t) FCurve *fcu= (FCurve *)ale->key_data; short intvals= (fcu->flag & FCURVE_INT_VALUES); - /* convert current-frame to action-time (slightly less accurate, espcially under + /* convert current-frame to action-time (slightly less accurate, especially under * higher scaling ratios, but is faster than converting all points) */ if (adt) diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 7825a655170..bdb0b3dfd7c 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -653,14 +653,14 @@ static float screen_aligned(RegionView3D *rv3d, float mat[][4]) } -/* radring = radius of donut rings +/* radring = radius of doughnut rings * radhole = radius hole * start = starting segment (based on nrings) * end = end segment * nsides = amount of points in ring * nrigns = amount of rings */ -static void partial_donut(float radring, float radhole, int start, int end, int nsides, int nrings) +static void partial_doughnut(float radring, float radhole, int start, int end, int nsides, int nrings) { float theta, phi, theta1; float cos_theta, sin_theta; @@ -1024,7 +1024,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving, preOrthoFront(ortho, rv3d->twmat, 2); if(G.f & G_PICKSEL) glLoadName(MAN_ROT_Z); manipulator_setcolor(v3d, 'Z', colcode, 255); - partial_donut(cusize/4.0f, 1.0f, 0, 48, 8, 48); + partial_doughnut(cusize/4.0f, 1.0f, 0, 48, 8, 48); postOrtho(ortho); } /* X circle */ @@ -1033,7 +1033,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving, if(G.f & G_PICKSEL) glLoadName(MAN_ROT_X); glRotatef(90.0, 0.0, 1.0, 0.0); manipulator_setcolor(v3d, 'X', colcode, 255); - partial_donut(cusize/4.0f, 1.0f, 0, 48, 8, 48); + partial_doughnut(cusize/4.0f, 1.0f, 0, 48, 8, 48); glRotatef(-90.0, 0.0, 1.0, 0.0); postOrtho(ortho); } @@ -1043,7 +1043,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving, if(G.f & G_PICKSEL) glLoadName(MAN_ROT_Y); glRotatef(-90.0, 1.0, 0.0, 0.0); manipulator_setcolor(v3d, 'Y', colcode, 255); - partial_donut(cusize/4.0f, 1.0f, 0, 48, 8, 48); + partial_doughnut(cusize/4.0f, 1.0f, 0, 48, 8, 48); glRotatef(90.0, 1.0, 0.0, 0.0); postOrtho(ortho); } @@ -1060,7 +1060,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving, if(G.f & G_PICKSEL) glLoadName(MAN_ROT_Z); manipulator_setcolor(v3d, 'Z', colcode, 255); - partial_donut(0.7f*cusize, 1.0f, 31, 33, 8, 64); + partial_doughnut(0.7f*cusize, 1.0f, 31, 33, 8, 64); glPopMatrix(); postOrtho(ortho); @@ -1075,7 +1075,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving, glRotatef(90.0, 1.0, 0.0, 0.0); glRotatef(90.0, 0.0, 0.0, 1.0); - partial_donut(0.7f*cusize, 1.0f, 31, 33, 8, 64); + partial_doughnut(0.7f*cusize, 1.0f, 31, 33, 8, 64); glPopMatrix(); postOrtho(ortho); @@ -1090,7 +1090,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving, glRotatef(-90.0, 0.0, 1.0, 0.0); glRotatef(90.0, 0.0, 0.0, 1.0); - partial_donut(0.7f*cusize, 1.0f, 31, 33, 8, 64); + partial_doughnut(0.7f*cusize, 1.0f, 31, 33, 8, 64); glPopMatrix(); postOrtho(ortho); diff --git a/source/blender/editors/util/editmode_undo.c b/source/blender/editors/util/editmode_undo.c index a06dcb10200..8c0eb06be67 100644 --- a/source/blender/editors/util/editmode_undo.c +++ b/source/blender/editors/util/editmode_undo.c @@ -126,7 +126,7 @@ void undo_editmode_push(bContext *C, const char *name, int nr; uintptr_t memused, totmem, maxmem; - /* at first here was code to prevent an "original" key to be insterted twice + /* at first here was code to prevent an "original" key to be inserted twice * this was giving conflicts for example when mesh changed due to keys or apply */ /* remove all undos after (also when curundo==NULL) */ diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h index c96b0509a27..195cab6b94e 100644 --- a/source/blender/imbuf/IMB_imbuf.h +++ b/source/blender/imbuf/IMB_imbuf.h @@ -52,7 +52,7 @@ * - File I/O must be done externally. The module uses FILE*'s to * direct input/output. * - Platform dependency is limited. Some minor patches for - * amiga and Irix are present. A 'posix-compliancy-patch' + * amiga and Irix are present. A 'posix-compliance-patch' * provides the interface to windows. * * \section dependencies Dependencies diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index 3e6c46ba8b1..cdb6d8d053c 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -197,7 +197,7 @@ typedef struct wmWindow { ListBase gesture; /* gesture stuff */ } wmWindow; -/* should be somthing like DNA_EXCLUDE +/* should be something like DNA_EXCLUDE * but the preprocessor first removes all comments, spaces etc */ # diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 2fa52776453..1d19ece90cd 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -844,7 +844,7 @@ static int calculate_structlens(int firststruct) structpoin= structs[a]; structtype= structpoin[0]; - /* length unkown yet */ + /* length unknown yet */ if(typelens[structtype]==0) { printf(" %s\n", types[structtype]); } diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index c7e28851084..246673082e7 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -2905,7 +2905,7 @@ static void rna_def_space_clip(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", SC_LOCK_TIMECURSOR); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CLIP, NULL); - /* show markers pathes */ + /* show markers paths */ prop= RNA_def_property(srna, "show_track_path", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SC_SHOW_TRACK_PATH); RNA_def_property_ui_text(prop, "Show Track Path", "Show path of how track moves"); diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c index 75aecc4f5af..7de8a8f7923 100644 --- a/source/blender/modifiers/intern/MOD_cast.c +++ b/source/blender/modifiers/intern/MOD_cast.c @@ -198,7 +198,7 @@ static void sphere_do( * tiny optimization: the code is separated (with parts repeated) * in two possible cases: * with or w/o a vgroup. With lots of if's in the code below, - * further optimizations are possible, if needed */ + * further optimization's are possible, if needed */ if (dvert) { /* with a vgroup */ MDeformVert *dv= dvert; float fac_orig = fac; @@ -396,7 +396,7 @@ static void cuboid_do( * tiny optimization: the code is separated (with parts repeated) * in two possible cases: * with or w/o a vgroup. With lots of if's in the code below, - * further optimizations are possible, if needed */ + * further optimization's are possible, if needed */ if (dvert) { /* with a vgroup */ float fac_orig = fac; for (i = 0; i < numVerts; i++) { diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 34957670080..496d41b1550 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -345,7 +345,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, /* Notice! * * Since we are only ordering the edges here it can avoid mallocing the - * extra space by abusing the vert array berfore its filled with new verts. + * extra space by abusing the vert array before its filled with new verts. * The new array for vert_connect must be at least sizeof(ScrewVertConnect) * totvert * and the size of our resulting meshes array is sizeof(MVert) * totvert * 3 * so its safe to use the second 2 thrids of MVert the array for vert_connect, diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.c b/source/blender/modifiers/intern/MOD_weightvg_util.c index 54baa9f9b18..3bc6c318d9f 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.c +++ b/source/blender/modifiers/intern/MOD_weightvg_util.c @@ -225,7 +225,7 @@ void weightvg_do_mask(int num, const int *indices, float *org_w, const float *ne -/* Applies weights to given vgroup (defgroup), and optionnaly add/remove vertices from the group. +/* Applies weights to given vgroup (defgroup), and optionally add/remove vertices from the group. * If dws is not NULL, it must be an array of MDeformWeight pointers of same length as weights (and * defgrp_idx can then have any value). * If indices is not NULL, it must be an array of same length as weights, mapping to the real diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.h b/source/blender/modifiers/intern/MOD_weightvg_util.h index ff5727cd403..a723d0f02e5 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.h +++ b/source/blender/modifiers/intern/MOD_weightvg_util.h @@ -77,7 +77,7 @@ void weightvg_do_mask(int num, const int *indices, float *org_w, const float *ne int tex_use_channel, int tex_mapping, Object *tex_map_object, const char *tex_uvlayer_name); -/* Applies weights to given vgroup (defgroup), and optionnaly add/remove vertices from the group. +/* Applies weights to given vgroup (defgroup), and optionally add/remove vertices from the group. * If indices is not NULL, it must be a table of same length as weights, mapping to the real * vertex index (in case the weight table does not cover the whole vertices...). */ diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c index dd9e1df95cd..74a4511b0dc 100644 --- a/source/blender/render/intern/source/shadeinput.c +++ b/source/blender/render/intern/source/shadeinput.c @@ -294,7 +294,7 @@ void shade_input_set_triangle_i(ShadeInput *shi, ObjectInstanceRen *obi, VlakRen } } -/* note, facenr declared volatile due to over-eager -O2 optimizations +/* note, facenr declared volatile due to over-eager -O2 optimization's * on cygwin (particularly -frerun-cse-after-loop) */ diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c index 8b3c3ec5c3d..c0723518880 100644 --- a/source/blender/render/intern/source/volume_precache.c +++ b/source/blender/render/intern/source/volume_precache.c @@ -284,7 +284,7 @@ static inline int lc_to_ms_I(int x, int y, int z, int *n) /* *** multiple scattering approximation *** */ -/* get the total amount of light energy in the light cache. used to normalise after multiple scattering */ +/* get the total amount of light energy in the light cache. used to normalize after multiple scattering */ static float total_ss_energy(Render *re, int do_test_break, VolumePrecache *vp) { int x, y, z; diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c index 66cbb18bc57..d45aee8ccf1 100644 --- a/source/blender/render/intern/source/volumetric.c +++ b/source/blender/render/intern/source/volumetric.c @@ -365,7 +365,7 @@ static float vol_get_phasefunc(ShadeInput *UNUSED(shi), float g, const float w[3 const float normalize = 0.25f; // = 1.f/4.f = M_PI/(4.f*M_PI) /* normalization constant is 1/4 rather than 1/4pi, since - * Blender's shading system doesn't normalise for + * Blender's shading system doesn't normalize for * energy conservation - eg. multiplying by pdf ( 1/pi for a lambert brdf ). * This means that lambert surfaces in Blender are pi times brighter than they 'should be' * and therefore, with correct energy conservation, volumes will darker than other solid objects, diff --git a/source/gameengine/Converter/BL_ArmatureObject.cpp b/source/gameengine/Converter/BL_ArmatureObject.cpp index 04618bf9e2d..dd2e29e4288 100644 --- a/source/gameengine/Converter/BL_ArmatureObject.cpp +++ b/source/gameengine/Converter/BL_ArmatureObject.cpp @@ -549,7 +549,7 @@ void BL_ArmatureObject::GetPose(bPose **pose) if (!*pose) { /* probably not to good of an idea to - * duplicate everying, but it clears up + * duplicate everything, but it clears up * a crash and memory leakage when * &BL_ActionActuator::m_pose is freed */ diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.h b/source/gameengine/GameLogic/Joystick/SCA_Joystick.h index f2ee3fc0f9f..ba4a64a138c 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.h +++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.h @@ -114,7 +114,7 @@ class SCA_Joystick void DestroyJoystickDevice(void); /** - * fills the axis mnember values + * fills the axis member values */ void pFillButtons(void); diff --git a/source/gameengine/GameLogic/SCA_MouseManager.h b/source/gameengine/GameLogic/SCA_MouseManager.h index 66a838651c2..4b40ab8a197 100644 --- a/source/gameengine/GameLogic/SCA_MouseManager.h +++ b/source/gameengine/GameLogic/SCA_MouseManager.h @@ -60,7 +60,7 @@ public: /** * Checks whether a mouse button is depressed. Ignores requests on non- - * mouse related evenst. Can also flag mouse movement. + * mouse related events. Can also flag mouse movement. */ bool IsPressed(SCA_IInputDevice::KX_EnumInputs inputcode); virtual void NextFrame(); diff --git a/source/gameengine/Ketsji/KX_CameraActuator.cpp b/source/gameengine/Ketsji/KX_CameraActuator.cpp index 1db8641376e..1361a6122ad 100644 --- a/source/gameengine/Ketsji/KX_CameraActuator.cpp +++ b/source/gameengine/Ketsji/KX_CameraActuator.cpp @@ -155,8 +155,8 @@ static void Kx_VecUpMat3(float vec[3], float mat[][3], short axis) float inp; short cox = 0, coy = 0, coz = 0; - /* up varieeren heeft geen zin, is eigenlijk helemaal geen up! - * zie VecUpMat3old + /* up range has no meaning, is not really up! + * see: VecUpMat3old */ if(axis==0) { diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp index da8df24d704..f78ff0081b7 100644 --- a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp +++ b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp @@ -175,7 +175,7 @@ bool KX_ConstraintActuator::Update(double curtime, bool frame) /* low-pass filtered time response, if the damp time is unequal to 0. */ /* Having to retrieve location/rotation and setting it afterwards may not */ - /* be efficient enough... Somthing to look at later. */ + /* be efficient enough... Something to look at later. */ KX_GameObject *obj = (KX_GameObject*) GetParent(); MT_Point3 position = obj->NodeGetWorldPosition(); MT_Point3 newposition; diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h index 843fba15725..69e7a7cf5a6 100644 --- a/source/gameengine/Ketsji/KX_GameObject.h +++ b/source/gameengine/Ketsji/KX_GameObject.h @@ -155,7 +155,7 @@ public: ); /** - * Compute an OpenGl compatable 4x4 matrix. Has the + * Compute an OpenGl compatible 4x4 matrix. Has the * side effect of storing the result internally. The * memory for the matrix remains the property of this class. */ diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index b754e82046f..1381dcb3607 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -393,7 +393,7 @@ void KX_KetsjiEngine::RenderDome() } /** - * Ketsji Init(), Initializes datastructures and converts data from + * Ketsji Init(), Initializes data-structures and converts data from * Blender into Ketsji native (realtime) format also sets up the * graphics context */ diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h index 1fa981e18f9..e89f1ed83a9 100644 --- a/source/gameengine/Ketsji/KX_Scene.h +++ b/source/gameengine/Ketsji/KX_Scene.h @@ -176,7 +176,7 @@ protected: STR_String m_sceneName; /** - * stores the worldsettings for a scene + * stores the world-settings for a scene */ KX_WorldInfo* m_worldinfo; diff --git a/source/gameengine/Rasterizer/RAS_ICanvas.h b/source/gameengine/Rasterizer/RAS_ICanvas.h index b7c26928378..337ea247ce3 100644 --- a/source/gameengine/Rasterizer/RAS_ICanvas.h +++ b/source/gameengine/Rasterizer/RAS_ICanvas.h @@ -170,7 +170,7 @@ public: ) = 0; /** - * Set the visible vieport + * Set the visible view-port */ virtual diff --git a/source/gameengine/Rasterizer/RAS_Polygon.cpp b/source/gameengine/Rasterizer/RAS_Polygon.cpp index 2f9c7c607ad..ebf34c3f58c 100644 --- a/source/gameengine/Rasterizer/RAS_Polygon.cpp +++ b/source/gameengine/Rasterizer/RAS_Polygon.cpp @@ -72,7 +72,7 @@ int RAS_Polygon::GetVertexOffsetAbs(RAS_MeshObject *mesh, int i) { /* hack that only works because there can only ever be 2 different * GetDisplayArray's per mesh. if this uses a different display array to the first - * then its incices are offset. + * then its indices are offset. * if support for edges is added back this would need to be changed. */ RAS_DisplayArray* darray= mesh->GetPolygon(0)->GetDisplayArray(); diff --git a/source/gameengine/SceneGraph/SG_IObject.h b/source/gameengine/SceneGraph/SG_IObject.h index df14631d0d9..a1d4207e508 100644 --- a/source/gameengine/SceneGraph/SG_IObject.h +++ b/source/gameengine/SceneGraph/SG_IObject.h @@ -105,10 +105,10 @@ typedef bool (*SG_RescheduleUpdateCallback)( /** * SG_Callbacks hold 2 call backs to the outside world. * The first is meant to be called when objects are replicated. - * And allows the outside world to syncronise external objects + * And allows the outside world to synchronize external objects * with replicated nodes and their children. - * The second is called when a node is detroyed and again - * is their for synconisation purposes + * The second is called when a node is destroyed and again + * is their for synchronization purposes * These callbacks may both be NULL. * The efficacy of this approach has not been proved some * alternatives might be to perform all replication and destruction @@ -226,9 +226,9 @@ public: /** * Get the client object associated with this * node. This interface allows you to associate - * arbitray external objects with this node. They are + * arbitrary external objects with this node. They are * passed to the callback functions when they are - * activated so you can syncronise these external objects + * activated so you can synchronize these external objects * upon replication and destruction * This may be NULL. */ @@ -246,7 +246,7 @@ public: /** * Set the client object for this node. This is just a * pointer to an object allocated that should exist for - * the duration of the lifetime of this object, or untill + * the duration of the lifetime of this object, or until * this function is called again. */ diff --git a/source/gameengine/SceneGraph/SG_Tree.h b/source/gameengine/SceneGraph/SG_Tree.h index dcca1a1442f..b2cbb227f77 100644 --- a/source/gameengine/SceneGraph/SG_Tree.h +++ b/source/gameengine/SceneGraph/SG_Tree.h @@ -126,7 +126,7 @@ public: * SG_TreeFactory generates an SG_Tree from a list of SG_Nodes. * It joins pairs of SG_Nodes to minimise the size of the resultant * bounding box. - * cf building an optimised Huffman tree. + * cf building an optimized Huffman tree. * \warning O(n^3)!!! */ class SG_TreeFactory diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.cpp b/source/gameengine/VideoTexture/VideoFFmpeg.cpp index aa8496431d9..9db85a0029a 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.cpp +++ b/source/gameengine/VideoTexture/VideoFFmpeg.cpp @@ -294,7 +294,7 @@ int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AV /* * This thread is used to load video frame asynchronously. * It provides a frame caching service. - * The main thread is responsible for positionning the frame pointer in the + * The main thread is responsible for positioning the frame pointer in the * file correctly before calling startCache() which starts this thread. * The cache is organized in two layers: 1) a cache of 20-30 undecoded packets to keep * memory and CPU low 2) a cache of 5 decoded frames. |