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-09 04:41:09 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-09 04:41:09 +0400
commit4f7bdc59d31e94bc97955c1efeef2a8fce0c8ecd (patch)
tree7e0a36829cf52ff260821ce02716727052b95d32 /source/blender/editors
parent27d43f3fd3a6fbda95cdb87e4672fe34f19c2205 (diff)
style cleanup: spelling.
also remove large, duplicate comments from sunsky.h
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/animation/keyframes_general.c2
-rw-r--r--source/blender/editors/armature/editarmature.c2
-rw-r--r--source/blender/editors/curve/editcurve.c10
-rw-r--r--source/blender/editors/interface/interface_draw.c2
-rw-r--r--source/blender/editors/interface/interface_templates.c10
-rw-r--r--source/blender/editors/interface/resources.c2
-rw-r--r--source/blender/editors/mesh/bmesh_select.c2
-rw-r--r--source/blender/editors/mesh/bmesh_tools.c2
-rw-r--r--source/blender/editors/object/object_add.c2
-rw-r--r--source/blender/editors/object/object_bake.c2
-rw-r--r--source/blender/editors/object/object_edit.c2
-rw-r--r--source/blender/editors/object/object_vgroup.c20
-rw-r--r--source/blender/editors/render/render_opengl.c2
-rw-r--r--source/blender/editors/sculpt_paint/paint_image.c2
-rw-r--r--source/blender/editors/space_file/filelist.c2
-rw-r--r--source/blender/editors/space_image/image_ops.c4
-rw-r--r--source/blender/editors/space_outliner/outliner_tools.c2
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c2
-rw-r--r--source/blender/editors/space_view3d/drawarmature.c2
-rw-r--r--source/blender/editors/space_view3d/drawmesh.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_fly.c4
-rw-r--r--source/blender/editors/transform/transform.c2
-rw-r--r--source/blender/editors/transform/transform.h2
-rw-r--r--source/blender/editors/transform/transform_conversions.c2
-rw-r--r--source/blender/editors/transform/transform_generics.c2
26 files changed, 45 insertions, 45 deletions
diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c
index 2067de22467..9ce148bc083 100644
--- a/source/blender/editors/animation/keyframes_general.c
+++ b/source/blender/editors/animation/keyframes_general.c
@@ -574,7 +574,7 @@ short copy_animedit_keys (bAnimContext *ac, ListBase *anim_data)
if (ELEM(NULL, animcopybuf.first, animcopybuf.last))
return -1;
- /* incase 'relative' paste method is used */
+ /* in case 'relative' paste method is used */
animcopy_cfra= CFRA;
/* everything went fine */
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index 3c5de538fdc..2a9436fdb41 100644
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -284,7 +284,7 @@ EditBone *make_boneList(ListBase *edbo, ListBase *bones, EditBone *parent, Bone
eBone->flag &= ~BONE_ROOTSEL;
}
- /* probably not selected but just incase */
+ /* probably not selected but just in case */
eBone->flag &= ~BONE_TIPSEL;
}
}
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 56f20a14d13..aa8dad08ac2 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -2227,7 +2227,7 @@ static int smooth_radius_exec(bContext *C, wmOperator *UNUSED(op))
break;
}
}
- /* incase there are no other selected verts */
+ /* in case there are no other selected verts */
end_sel = start_sel;
for(bezt=nu->bezt+(start_sel+1), a=start_sel+1; a<nu->pntsu; a++, bezt++) {
if((bezt->f2 & SELECT)==0) {
@@ -2289,7 +2289,7 @@ static int smooth_radius_exec(bContext *C, wmOperator *UNUSED(op))
break;
}
}
- /* incase there are no other selected verts */
+ /* in case there are no other selected verts */
end_sel = start_sel;
for(bp=nu->bp+(start_sel+1), a=start_sel+1; a<nu->pntsu; a++, bp++) {
if((bp->f1 & SELECT)==0) {
@@ -5160,7 +5160,7 @@ void CURVE_OT_select_more(wmOperatorType *ot)
/******************** select less operator *****************/
-/* basic method: deselect if control point doesn't have all neighbours selected */
+/* basic method: deselect if control point doesn't have all neighbors selected */
static int select_less_exec(bContext *C, wmOperator *UNUSED(op))
{
Object *obedit= CTX_data_edit_object(C);
@@ -5181,7 +5181,7 @@ static int select_less_exec(bContext *C, wmOperator *UNUSED(op))
if((bp->hide==0) && (bp->f1 & SELECT)) {
sel= 0;
- /* check if neighbours have been selected */
+ /* check if neighbors have been selected */
/* edges of surface are an exception */
if((a+1)%nu->pntsu==0) sel++;
else {
@@ -5236,7 +5236,7 @@ static int select_less_exec(bContext *C, wmOperator *UNUSED(op))
if(lastsel==1) sel= 1;
else sel= 0;
- /* check if neighbours have been selected */
+ /* check if neighbors have been selected */
/* first and last are exceptions */
if(a==nu->pntsu-1) sel++;
else {
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index 1cf93ba8b11..01700e1c52a 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -1052,7 +1052,7 @@ void ui_draw_but_COLORBAND(uiBut *but, uiWidgetColors *UNUSED(wcol), rcti *rect)
float x1, y1, sizex, sizey;
float v3[2], v1[2], v2[2], v1a[2], v2a[2];
int a;
- float pos, colf[4]= {0,0,0,0}; /* initialize incase the colorband isnt valid */
+ float pos, colf[4]= {0,0,0,0}; /* initialize in case the colorband isnt valid */
coba= (ColorBand *)(but->editcoba? but->editcoba: but->poin);
if(coba==NULL) return;
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index aa2d939d5f1..f868cd86db7 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1944,7 +1944,7 @@ void uiTemplateColorWheel(uiLayout *layout, PointerRNA *ptr, const char *propnam
}
if(lock_luminosity) {
- float color[4]; /* incase of alpha */
+ float color[4]; /* in case of alpha */
but->flag |= UI_BUT_VEC_SIZE_LOCK;
RNA_property_float_get_array(ptr, prop, color);
but->a2= len_v3(color);
@@ -2246,11 +2246,11 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe
* integer = IntProperty()
* string = StringProperty()
*
- * # A string of all identifiers (colon-separated) which property’s controls should be
+ * # A string of all identifiers (colon-separated) which property's controls should be
* # displayed in a template_list.
* template_list_controls = StringProperty(default="integer:bool:string", options={"HIDDEN"})
*
- * … you’ll get a numfield for the integer prop, a check box for the bool prop, and a textfield
+ * ... you'll get a numfield for the integer prop, a check box for the bool prop, and a textfield
* for the string prop, after the name of each item of the collection.
*/
else if (prop_list_id) {
@@ -2259,9 +2259,9 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe
/* XXX: Check, as sometimes we get an itemptr looking like
* {id = {data = 0x0}, type = 0x0, data = 0x0}
- * which would obviously produce a sigsev… */
+ * which would obviously produce a sigsev... */
if (itemptr->type) {
- /* If the special property is set for the item, and it is a collection… */
+ /* If the special property is set for the item, and it is a collection... */
PropertyRNA *prop_list= RNA_struct_find_property(itemptr, prop_list_id);
if(prop_list && RNA_property_type(prop_list) == PROP_STRING) {
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 3dadd69c9f4..8dd17888e22 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -1206,7 +1206,7 @@ void init_userdef_do_versions(void)
U.pad_rot_angle= 15;
/* signal for derivedmesh to use colorband */
- /* run incase this was on and is now off in the user prefs [#28096] */
+ /* run in case this was on and is now off in the user prefs [#28096] */
vDM_ColorBand_store((U.flag & USER_CUSTOM_RANGE) ? (&U.coba_weight):NULL);
if (bmain->versionfile <= 191) {
diff --git a/source/blender/editors/mesh/bmesh_select.c b/source/blender/editors/mesh/bmesh_select.c
index 3085a293143..2c5e8439b57 100644
--- a/source/blender/editors/mesh/bmesh_select.c
+++ b/source/blender/editors/mesh/bmesh_select.c
@@ -1262,7 +1262,7 @@ static int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, B
/*
* Arrays are now filled as follows:
*
- * nedges[n] = sum of the # of edges incident to all vertices numbered 0 thru n - 1
+ * nedges[n] = sum of the # of edges incident to all vertices numbered 0 through n - 1
* edges[edges[n]..edges[n - 1]] = the indices of of the edges incident to vertex n
*
* As the search continues, prevedge[n] will be the previous edge on the shortest
diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c
index 41eb85007f2..924e1fbf339 100644
--- a/source/blender/editors/mesh/bmesh_tools.c
+++ b/source/blender/editors/mesh/bmesh_tools.c
@@ -2409,7 +2409,7 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event)
/* rip two adjacent edges */
if (BM_edge_face_count(e2) == 1 || BM_vert_face_count(v) == 2) {
l = e2->l;
- ripvert = BM_face_vert_rip(bm, l->f, v);
+ ripvert = BM_face_vert_separate(bm, l->f, v);
BLI_assert(ripvert);
if (!ripvert) {
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 0c12d701616..996dd4ca59f 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1143,7 +1143,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
* still work out ok */
object_apply_mat4(ob_dst, dob->mat, FALSE, TRUE);
- /* to set ob_dst->orig and incase theres any other discrepicies */
+ /* to set ob_dst->orig and in case theres any other discrepicies */
DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB);
}
}
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index f1fbf27312a..b3629abc4e6 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -1384,7 +1384,7 @@ static void bake_update(void *bkv)
{
BakeRender *bkr= bkv;
- if(bkr->sa && bkr->sa->spacetype==SPACE_IMAGE) { /* incase the user changed while baking */
+ if(bkr->sa && bkr->sa->spacetype==SPACE_IMAGE) { /* in case the user changed while baking */
SpaceImage *sima= bkr->sa->spacedata.first;
if(sima)
sima->image= RE_bake_shade_get_image();
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 385eb1be656..e456e6f0796 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -741,7 +741,7 @@ static void copy_texture_space(Object *to, Object *ob)
}
-/* UNUSED, keep incase we want to copy functionality for use elsewhere */
+/* UNUSED, keep in case we want to copy functionality for use elsewhere */
static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event)
{
Object *ob;
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index 34396bf7fa4..6a144ad748b 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -715,7 +715,7 @@ static void vgroup_normalize(Object *ob)
for(i = 0; i < dvert_tot; i++) {
- /* incase its not selected */
+ /* in case its not selected */
if (!(dv = dvert_array[i])) {
continue;
}
@@ -729,7 +729,7 @@ static void vgroup_normalize(Object *ob)
if(weight_max > 0.0f) {
for(i = 0; i < dvert_tot; i++) {
- /* incase its not selected */
+ /* in case its not selected */
if (!(dv = dvert_array[i])) {
continue;
}
@@ -738,7 +738,7 @@ static void vgroup_normalize(Object *ob)
if(dw) {
dw->weight /= weight_max;
- /* incase of division errors with very low weights */
+ /* in case of division errors with very low weights */
CLAMP(dw->weight, 0.0f, 1.0f);
}
}
@@ -1113,7 +1113,7 @@ static void vgroup_levels(Object *ob, float offset, float gain)
if (dvert_array) {
for(i = 0; i < dvert_tot; i++) {
- /* incase its not selected */
+ /* in case its not selected */
if (!(dv = dvert_array[i])) {
continue;
}
@@ -1149,7 +1149,7 @@ static void vgroup_normalize_all(Object *ob, int lock_active)
if(lock_active) {
for(i = 0; i < dvert_tot; i++) {
- /* incase its not selected */
+ /* in case its not selected */
if (!(dv = dvert_array[i])) {
continue;
}
@@ -1160,7 +1160,7 @@ static void vgroup_normalize_all(Object *ob, int lock_active)
else {
for(i = 0; i < dvert_tot; i++) {
- /* incase its not selected */
+ /* in case its not selected */
if (!(dv = dvert_array[i])) {
continue;
}
@@ -1220,7 +1220,7 @@ static void vgroup_invert(Object *ob, const short auto_assign, const short auto_
if (dvert_array) {
for(i = 0; i < dvert_tot; i++) {
- /* incase its not selected */
+ /* in case its not selected */
if (!(dv = dvert_array[i])) {
continue;
}
@@ -1324,7 +1324,7 @@ static void vgroup_blend(Object *ob)
dw= defvert_verify_index(dvert, def_nr);
dw->weight= vg_weights[i] / (float)vg_users[i];
- /* incase of division errors */
+ /* in case of division errors */
CLAMP(dw->weight, 0.0f, 1.0f);
}
@@ -1353,7 +1353,7 @@ static void vgroup_clean(Object *ob, const float epsilon, int keep_single)
/* only the active group */
for(i = 0; i < dvert_tot; i++) {
- /* incase its not selected */
+ /* in case its not selected */
if (!(dv = dvert_array[i])) {
continue;
}
@@ -1388,7 +1388,7 @@ static void vgroup_clean_all(Object *ob, const float epsilon, const int keep_sin
for(i = 0; i < dvert_tot; i++) {
int j;
- /* incase its not selected */
+ /* in case its not selected */
if (!(dv = dvert_array[i])) {
continue;
}
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index 74b0c40b6fd..79832e2a9d1 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -334,7 +334,7 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op)
oglrender->scene->customdata_mask_modal = (ED_view3d_datamask(oglrender->scene, oglrender->v3d) |
ED_view3d_object_datamask(oglrender->scene) );
- /* apply immediately incase we're rendering from a script,
+ /* apply immediately in case we're rendering from a script,
* running notifiers again will overwrite */
oglrender->scene->customdata_mask |= oglrender->scene->customdata_mask_modal;
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 32dda420aec..f8a9516c97e 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -2714,7 +2714,7 @@ static void project_paint_bucket_bounds(const ProjPaintState *ps, const float mi
bucketMax[0] = (int)((int)(((float)(max[0] - ps->screenMin[0]) / ps->screen_width) * ps->buckets_x) + 1.5f);
bucketMax[1] = (int)((int)(((float)(max[1] - ps->screenMin[1]) / ps->screen_height) * ps->buckets_y) + 1.5f);
- /* incase the rect is outside the mesh 2d bounds */
+ /* in case the rect is outside the mesh 2d bounds */
CLAMP(bucketMin[0], 0, ps->buckets_x);
CLAMP(bucketMin[1], 0, ps->buckets_y);
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index b5059d157b9..f0baa6acf8c 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -1011,7 +1011,7 @@ void filelist_from_library(struct FileList* filelist)
idcode= groupname_to_code(group);
/* memory for strings is passed into filelist[i].relname
- * and free'd in freefilelist */
+ * and freed in freefilelist */
if (idcode) {
previews= BLO_blendhandle_get_previews(filelist->libfiledata, idcode, &nprevs);
names= BLO_blendhandle_get_datablock_names(filelist->libfiledata, idcode, &nnames);
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 6742852cbf4..ae47125fa84 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1059,7 +1059,7 @@ static int save_image_options_init(SaveImageOptions *simopts, SpaceImage *sima,
/* sanitize all settings */
- /* unlikely but just incase */
+ /* unlikely but just in case */
if (ELEM3(simopts->im_format.planes, R_IMF_PLANES_BW, R_IMF_PLANES_RGB, R_IMF_PLANES_RGBA) == 0) {
simopts->im_format.planes= R_IMF_PLANES_RGBA;
}
@@ -1229,7 +1229,7 @@ static int image_save_as_exec(bContext *C, wmOperator *op)
save_image_options_defaults(&simopts);
- /* just incase to initialize values,
+ /* just in case to initialize values,
* these should be set on invoke or by the caller. */
save_image_options_init(&simopts, sima, CTX_data_scene(C), 0);
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 7fdd2e73181..b44e363090f 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -391,7 +391,7 @@ static void group_linkobs2scene_cb(bContext *UNUSED(C), Scene *scene, TreeElemen
gob->ob->flag |= SELECT;
base->flag = gob->ob->flag;
base->object= gob->ob;
- id_lib_extern((ID *)gob->ob); /* incase these are from a linked group */
+ id_lib_extern((ID *)gob->ob); /* in case these are from a linked group */
}
}
}
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index e50d1ae6fc9..1bbf4b670b5 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -830,7 +830,7 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq
}
break;
case SEQ_DRAW_IMG_WAVEFORM:
- if ((sseq->flag & SEQ_DRAW_COLOR_SEPERATED) != 0) {
+ if ((sseq->flag & SEQ_DRAW_COLOR_SEPARATED) != 0) {
scope = make_sep_waveform_view_from_ibuf(ibuf);
} else {
scope = make_waveform_view_from_ibuf(ibuf);
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c
index dd3d0c05beb..54dff3e4786 100644
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@ -1980,7 +1980,7 @@ static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
unsigned char col[4];
float col_f[4];
- glGetFloatv(GL_CURRENT_COLOR, col_f); /* incase this is not set below */
+ glGetFloatv(GL_CURRENT_COLOR, col_f); /* in case this is not set below */
rgb_float_to_uchar(col, col_f);
col[3]= 255;
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index 32f2d1bab9f..651b0edb123 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -826,7 +826,7 @@ void draw_mesh_textured_old(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec
/* reset from negative scale correction */
glFrontFace(GL_CCW);
- /* in editmode, the blend mode needs to be set incase it was ADD */
+ /* in editmode, the blend mode needs to be set in case it was ADD */
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index a9533b57d8f..7bf5d29574a 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1076,7 +1076,7 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
* 0.0001 on the lower left the 2D border sometimes
* obscures the 3D camera border */
/* note: with VIEW3D_CAMERA_BORDER_HACK defined this error isn't noticeable
- * but keep it here incase we need to remove the workaround */
+ * but keep it here in case we need to remove the workaround */
x1i= (int)(x1 - 1.0001f);
y1i= (int)(y1 - 1.0001f);
x2i= (int)(x2 + (1.0f-0.0001f));
diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c
index 3218daf65c7..89794706181 100644
--- a/source/blender/editors/space_view3d/view3d_fly.c
+++ b/source/blender/editors/space_view3d/view3d_fly.c
@@ -196,8 +196,8 @@ typedef struct FlyInfo {
/* backup values */
float dist_backup; /* backup the views distance since we use a zero dist for fly mode */
- float ofs_backup[3]; /* backup the views offset incase the user cancels flying in non camera mode */
- float rot_backup[4]; /* backup the views quat incase the user cancels flying in non camera mode.
+ float ofs_backup[3]; /* backup the views offset in case the user cancels flying in non camera mode */
+ float rot_backup[4]; /* backup the views quat in case the user cancels flying in non camera mode.
* (quat for view, eul for camera) */
short persp_backup; /* remember if were ortho or not, only used for restoring the view if it was a ortho view */
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 64c4cacb8b6..666d0a2f7f2 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1715,7 +1715,7 @@ int initTransform(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event, int
/* overwrite initial values if operator supplied a non-null vector */
if ( (prop = RNA_struct_find_property(op->ptr, "value")) && RNA_property_is_set(op->ptr, prop))
{
- float values[4]= {0}; /* incase value isn't length 4, avoid uninitialized memory */
+ float values[4]= {0}; /* in case value isn't length 4, avoid uninitialized memory */
if(RNA_property_array_check(prop)) {
RNA_float_get_array(op->ptr, "value", values);
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 9010ce0c18e..48c05f00ea8 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -148,7 +148,7 @@ typedef struct TransData2D {
float ih1[2], ih2[2];
} TransData2D;
-/* we need to store 2 handles for each transdata incase the other handle wasnt selected */
+/* we need to store 2 handles for each transdata in case the other handle wasnt selected */
typedef struct TransDataCurveHandleFlags {
char ih1, ih2;
char *h1, *h2;
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index be2382fd11c..146c8e5cc00 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -1421,7 +1421,7 @@ static TransDataCurveHandleFlags *initTransDataCurveHandles(TransData *td, struc
hdata = td->hdata = MEM_mallocN(sizeof(TransDataCurveHandleFlags), "CuHandle Data");
hdata->ih1 = bezt->h1;
hdata->h1 = &bezt->h1;
- hdata->ih2 = bezt->h2; /* incase the second is not selected */
+ hdata->ih2 = bezt->h2; /* in case the second is not selected */
hdata->h2 = &bezt->h2;
return hdata;
}
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index f59b075525e..d24081ae472 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -512,7 +512,7 @@ static void recalcData_nla(TransInfo *t)
if ((pExceeded && nExceeded) || (iter == 4) ) {
/* both endpoints exceeded (or iteration ping-pong'd meaning that we need a compromise)
* - simply crop strip to fit within the bounds of the strips bounding it
- * - if there were no neighbours, clear the transforms (make it default to the strip's current values)
+ * - if there were no neighbors, clear the transforms (make it default to the strip's current values)
*/
if (strip->prev && strip->next) {
tdn->h1[0]= strip->prev->end;