Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-03-04 08:35:12 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-04 08:35:12 +0400
commitf6ae27daef0e0a27e0c14ef3412161eec229c539 (patch)
tree00001b4c738d9dbba104a49de15d566dfe82b345 /source/blender/editors
parent4f2976941fd7284c85e89c1de5038805e62a5c99 (diff)
style cleanup - comment spelling + translate some dutch.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/animation/anim_channels_defines.c2
-rw-r--r--source/blender/editors/animation/anim_channels_edit.c2
-rw-r--r--source/blender/editors/animation/anim_filter.c2
-rw-r--r--source/blender/editors/animation/keyframes_edit.c2
-rw-r--r--source/blender/editors/animation/keyframing.c2
-rw-r--r--source/blender/editors/armature/editarmature.c2
-rw-r--r--source/blender/editors/armature/poseSlide.c2
-rw-r--r--source/blender/editors/armature/poseobject.c2
-rw-r--r--source/blender/editors/curve/editcurve.c12
-rw-r--r--source/blender/editors/gpencil/gpencil_paint.c2
-rw-r--r--source/blender/editors/include/BIF_glutil.h2
-rw-r--r--source/blender/editors/include/ED_mesh.h10
-rw-r--r--source/blender/editors/interface/interface.c4
-rw-r--r--source/blender/editors/interface/interface_handlers.c2
-rw-r--r--source/blender/editors/interface/interface_ops.c2
-rw-r--r--source/blender/editors/interface/interface_panel.c2
-rw-r--r--source/blender/editors/interface/interface_style.c2
-rw-r--r--source/blender/editors/interface/view2d.c4
-rw-r--r--source/blender/editors/interface/view2d_ops.c2
-rw-r--r--source/blender/editors/mesh/bmesh_select.c2
-rw-r--r--source/blender/editors/mesh/bmesh_utils.c2
-rw-r--r--source/blender/editors/mesh/knifetool.c2
-rw-r--r--source/blender/editors/metaball/mball_edit.c2
-rw-r--r--source/blender/editors/object/object_edit.c2
-rw-r--r--source/blender/editors/object/object_modifier.c2
-rw-r--r--source/blender/editors/object/object_select.c2
-rw-r--r--source/blender/editors/object/object_transform.c2
-rw-r--r--source/blender/editors/object/object_vgroup.c6
-rw-r--r--source/blender/editors/physics/dynamicpaint_ops.c2
-rw-r--r--source/blender/editors/physics/particle_edit.c2
-rw-r--r--source/blender/editors/screen/area.c2
-rw-r--r--source/blender/editors/screen/screen_ops.c2
-rw-r--r--source/blender/editors/sculpt_paint/paint_vertex.c2
-rw-r--r--source/blender/editors/sculpt_paint/sculpt.c2
-rw-r--r--source/blender/editors/space_clip/clip_draw.c4
-rw-r--r--source/blender/editors/space_clip/space_clip.c2
-rw-r--r--source/blender/editors/space_clip/tracking_ops.c2
-rw-r--r--source/blender/editors/space_graph/graph_select.c2
-rw-r--r--source/blender/editors/space_graph/graph_utils.c4
-rw-r--r--source/blender/editors/space_logic/logic_window.c4
-rw-r--r--source/blender/editors/space_node/node_edit.c2
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.c2
-rw-r--r--source/blender/editors/space_sequencer/sequencer_add.c2
-rw-r--r--source/blender/editors/space_sequencer/sequencer_edit.c2
-rw-r--r--source/blender/editors/space_text/text_draw.c2
-rw-r--r--source/blender/editors/space_view3d/drawobject.c8
-rw-r--r--source/blender/editors/space_view3d/view3d_buttons.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_edit.c4
-rw-r--r--source/blender/editors/space_view3d/view3d_fly.c4
-rw-r--r--source/blender/editors/space_view3d/view3d_header.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_select.c4
-rw-r--r--source/blender/editors/transform/transform.c2
-rw-r--r--source/blender/editors/transform/transform_constraints.c2
-rw-r--r--source/blender/editors/transform/transform_conversions.c12
-rw-r--r--source/blender/editors/transform/transform_manipulator.c16
-rw-r--r--source/blender/editors/util/editmode_undo.c2
56 files changed, 85 insertions, 95 deletions
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) */