diff options
Diffstat (limited to 'source/blender/editors')
56 files changed, 144 insertions, 144 deletions
diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index 9ce148bc083..5d6d02bef63 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -853,7 +853,7 @@ short paste_animedit_keys (bAnimContext *ac, ListBase *anim_data, } } - /* dont continue if some fcurves were pasted */ + /* don't continue if some fcurves were pasted */ if (totmatch) break; } diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index ec02f406fcf..5945d25f3ee 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -1965,7 +1965,7 @@ float ED_rollBoneToVector(EditBone *bone, const float align_axis[3], const short sub_v3_v3v3(nor, bone->tail, bone->head); vec_roll_to_mat3(nor, 0.0f, mat); - /* check the bone isnt aligned with the axis */ + /* check the bone isn't aligned with the axis */ if(!is_zero_v3(align_axis) && angle_v3v3(align_axis, mat[2]) > FLT_EPSILON) { float vec[3], align_axis_proj[3], roll; @@ -2153,7 +2153,7 @@ static void undoBones_to_editBones(void *uarmv, void *armv, void *UNUSED(data)) for(newebo= arm->edbo->first; newebo; newebo= newebo->next) { if(newebo->parent) newebo->parent= newebo->parent->temp; } - /* be sure they dont hang ever */ + /* be sure they don't hang ever */ for(newebo= arm->edbo->first; newebo; newebo= newebo->next) { newebo->temp= NULL; } @@ -3386,7 +3386,7 @@ static int armature_extrude_exec(bContext *C, wmOperator *op) newbone->zwidth= ebone->zwidth; newbone->ease1= ebone->ease1; newbone->ease2= ebone->ease2; - newbone->rad_head= ebone->rad_tail; // dont copy entire bone... + newbone->rad_head= ebone->rad_tail; // don't copy entire bone... newbone->rad_tail= ebone->rad_tail; newbone->segments= 1; newbone->layer= ebone->layer; diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 8caa6cc6e26..b49ea7e5595 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -2256,13 +2256,13 @@ static int smooth_radius_exec(bContext *C, wmOperator *UNUSED(op)) /* if endpoints selected, then use them */ if (start_sel==0) { start_rad = (nu->bezt+start_sel)->radius; - start_sel++; /* we dont want to edit the selected endpoint */ + start_sel++; /* we don't want to edit the selected endpoint */ } else { start_rad = (nu->bezt+start_sel-1)->radius; } if (end_sel==nu->pntsu-1) { end_rad = (nu->bezt+end_sel)->radius; - end_sel--; /* we dont want to edit the selected endpoint */ + end_sel--; /* we don't want to edit the selected endpoint */ } else { end_rad = (nu->bezt+end_sel+1)->radius; } @@ -2318,13 +2318,13 @@ static int smooth_radius_exec(bContext *C, wmOperator *UNUSED(op)) /* if endpoints selected, then use them */ if (start_sel==0) { start_rad = (nu->bp+start_sel)->radius; - start_sel++; /* we dont want to edit the selected endpoint */ + start_sel++; /* we don't want to edit the selected endpoint */ } else { start_rad = (nu->bp+start_sel-1)->radius; } if (end_sel==nu->pntsu-1) { end_rad = (nu->bp+end_sel)->radius; - end_sel--; /* we dont want to edit the selected endpoint */ + end_sel--; /* we don't want to edit the selected endpoint */ } else { end_rad = (nu->bp+end_sel+1)->radius; } diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index 76af016b6c6..b307052d37a 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -79,7 +79,7 @@ typedef enum eDrawStrokeFlags { GP_DRAWDATA_ONLYV2D = (1<<2), /* only draw 'canvas' strokes */ GP_DRAWDATA_ONLYI2D = (1<<3), /* only draw 'image' strokes */ GP_DRAWDATA_IEDITHACK = (1<<4), /* special hack for drawing strokes in Image Editor (weird coordinates) */ - GP_DRAWDATA_NO_XRAY = (1<<5), /* dont draw xray in 3D view (which is default) */ + GP_DRAWDATA_NO_XRAY = (1<<5), /* don't draw xray in 3D view (which is default) */ } eDrawStrokeFlags; @@ -298,7 +298,7 @@ static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness_s for (i=0, pt1=points, pt2=points+1; i < (totpoints-1); i++, pt1++, pt2++) { float s0[2], s1[2]; /* segment 'center' points */ - float t0[2], t1[2]; /* tesselated coordinates */ + float t0[2], t1[2]; /* tessellated coordinates */ float m1[2], m2[2]; /* gradient and normal */ float mt[2], sc[2]; /* gradient for thickness, point for end-cap */ float pthick; /* thickness at segment point */ @@ -513,7 +513,7 @@ static void gp_draw_strokes (bGPDframe *gpf, int offsx, int offsy, int winx, int glDepthMask(0); glEnable(GL_DEPTH_TEST); - /* first arg is normally rv3d->dist, but this isnt available here and seems to work quite well without */ + /* first arg is normally rv3d->dist, but this isn't available here and seems to work quite well without */ bglPolygonOffset(1.0f, 1.0f); #if 0 glEnable(GL_POLYGON_OFFSET_LINE); @@ -783,7 +783,7 @@ void draw_gpencil_view3d (Scene *scene, View3D *v3d, ARegion *ar, short only3d) gpd= gpencil_data_get_active_v3d(scene); // XXX if (gpd == NULL) return; - /* when rendering to the offscreen buffer we dont want to + /* when rendering to the offscreen buffer we don't want to * deal with the camera border, otherwise map the coords to the camera border. */ if ((rv3d->persp == RV3D_CAMOB) && !(G.f & G_RENDER_OGL)) { rctf rectf; diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c index c932eb4c7d0..36f78e151d5 100644 --- a/source/blender/editors/gpencil/editaction_gpencil.c +++ b/source/blender/editors/gpencil/editaction_gpencil.c @@ -561,7 +561,7 @@ static short mirror_gpf_xaxis (bGPDframe *gpf, Scene *scene) static short mirror_gpf_marker (bGPDframe *gpf, Scene *scene) { static TimeMarker *marker; - static short initialised = 0; + static short initialized = 0; int diff; /* In order for this mirror function to work without @@ -581,16 +581,16 @@ static short mirror_gpf_marker (bGPDframe *gpf, Scene *scene) } else { /* initialization time */ - if (initialised) { + if (initialized) { /* reset everything for safety */ marker = NULL; - initialised = 0; + initialized = 0; } else { /* try to find a marker */ marker= ED_markers_get_first_selected(&scene->markers); if(marker) { - initialised= 1; + initialized= 1; } } } diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 9136274e39a..390ee76dfcc 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -706,7 +706,7 @@ int uiButActiveOnly(const bContext *C, uiBlock *block, uiBut *but) return 1; } -/* use to check if we need to disable undo, but dont make any changes +/* use to check if we need to disable undo, but don't make any changes * returns FALSE if undo needs to be disabled. */ static int ui_but_is_rna_undo(uiBut *but) { @@ -1880,7 +1880,7 @@ void ui_set_but_soft_range(uiBut *but, double value) { /* ideally we would not limit this but practically, its more then * enough worst case is very long vectors wont use a smart soft-range - * which isnt so bad. */ + * which isn't so bad. */ if(but->rnaprop) { const PropertyType type= RNA_property_type(but->rnaprop); @@ -2957,7 +2957,7 @@ void autocomplete_end(AutoComplete *autocpl, char *autoname) if(autocpl->truncate[0]) BLI_strncpy(autoname, autocpl->truncate, autocpl->maxlen); else { - if (autoname != autocpl->startname) /* dont copy a string over its self */ + if (autoname != autocpl->startname) /* don't copy a string over its self */ BLI_strncpy(autoname, autocpl->startname, autocpl->maxlen); } MEM_freeN(autocpl->truncate); diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index cfd9f65cf00..39ae2ec37f4 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 in case the colorband isnt valid */ + float pos, colf[4]= {0,0,0,0}; /* initialize in case the colorband isn't valid */ coba= (ColorBand *)(but->editcoba? but->editcoba: but->poin); if(coba==NULL) return; diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 537de167153..c7db8d9214f 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -349,7 +349,7 @@ static void ui_apply_autokey_undo(bContext *C, uiBut *but) else if(but->drawstr[0]) str= but->drawstr; else str= but->tip; - /* fallback, else we dont get an undo! */ + /* fallback, else we don't get an undo! */ if(str == NULL || str[0] == '\0') { str= "Unknown Action"; } @@ -1647,7 +1647,7 @@ static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data) int strip= BLI_utf8_invalid_strip(but->editstr, strlen(but->editstr)); /* not a file?, strip non utf-8 chars */ if(strip) { - /* wont happen often so isnt that annoying to keep it here for a while */ + /* wont happen often so isn't that annoying to keep it here for a while */ printf("%s: invalid utf8 - stripped chars %d\n", __func__, strip); } } diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 3b6648a6441..723ffb355a2 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1589,7 +1589,7 @@ void uiItemMenuF(uiLayout *layout, const char *name, int icon, uiMenuCreateFunc typedef struct MenuItemLevel { int opcontext; - /* dont use pointers to the strings because python can dynamically + /* don't use pointers to the strings because python can dynamically * allocate strings and free before the menu draws, see [#27304] */ char opname[OP_MAX_TYPENAME]; char propname[MAX_IDPROP_NAME]; diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index 5ca3f730006..80c77a54a84 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -307,7 +307,7 @@ static int reset_default_button_exec(bContext *C, wmOperator *op) } } - /* Since we dont want to undo _all_ edits to settings, eg window + /* Since we don't want to undo _all_ edits to settings, eg window * edits on the screen or on operator settings. * it might be better to move undo's inline - campbell */ if(success) { diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index b1099576505..c5abcd46437 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -617,7 +617,7 @@ static int get_panel_size_y(Panel *pa) return PNL_HEADER + pa->sizey; } -/* this function is needed because uiBlock and Panel itself dont +/* this function is needed because uiBlock and Panel itself don't * change sizey or location when closed */ static int get_panel_real_ofsy(Panel *pa) { @@ -1001,7 +1001,7 @@ static void ui_do_drag(const bContext *C, wmEvent *event, Panel *panel) /* this function is supposed to call general window drawing too */ -/* also it supposes a block has panel, and isnt a menu */ +/* also it supposes a block has panel, and isn't a menu */ static void ui_handle_panel_header(const bContext *C, uiBlock *block, int mx, int my, int event) { ScrArea *sa= CTX_wm_area(C); diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index f971410672c..a5c1bc0e659 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1282,7 +1282,7 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but, if(dir2==0) if(dir1==UI_LEFT || dir1==UI_RIGHT) dir2= UI_DOWN; if(dir2==0) if(dir1==UI_TOP || dir1==UI_DOWN) dir2= UI_LEFT; - /* no space at all? dont change */ + /* no space at all? don't change */ if(left || right) { if(dir1==UI_LEFT && left==0) dir1= UI_RIGHT; if(dir1==UI_RIGHT && right==0) dir1= UI_LEFT; diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index f868cd86db7..2b225fb56c2 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -793,9 +793,9 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, } } /* tessellation point for curve-typed objects */ else if (ELEM3(ob->type, OB_CURVE, OB_SURF, OB_FONT)) { - /* some modifiers could work with pre-tesselated curves only */ + /* some modifiers could work with pre-tessellated curves only */ if (ELEM3(md->type, eModifierType_Hook, eModifierType_Softbody, eModifierType_MeshDeform)) { - /* add disabled pre-tesselated button, so users could have + /* add disabled pre-tessellated button, so users could have * message for this modifiers */ but = uiDefIconButBitI(block, TOG, eModifierMode_ApplyOnSpline, 0, ICON_SURFACE_DATA, 0, 0, UI_UNIT_X-2, UI_UNIT_Y, &md->mode, 0.0, 0.0, 0.0, 0.0, TIP_("This modifier could be applied on splines' points only")); @@ -1579,7 +1579,7 @@ static void curvemap_buttons_zoom_out(bContext *C, void *cumap_v, void *UNUSED(u CurveMapping *cumap = cumap_v; float d, d1; - /* we allow 20 times zoom, but dont view outside clip */ + /* we allow 20 times zoom, but don't view outside clip */ if( (cumap->curr.xmax - cumap->curr.xmin) < 20.0f*(cumap->clipr.xmax - cumap->clipr.xmin) ) { d= d1= 0.15f*(cumap->curr.xmax - cumap->curr.xmin); diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 2feccf7a4e8..142584f62fd 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -161,7 +161,7 @@ static void view2d_masks(View2D *v2d) * - for some of these presets, it is expected that the region will have defined some * additional settings necessary for the customisation of the 2D viewport to its requirements * - this function should only be called from region init() callbacks, where it is expected that - * this is called before UI_view2d_size_update(), as this one checks that the rects are properly initialised. + * this is called before UI_view2d_size_update(), as this one checks that the rects are properly initialized. */ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy) { @@ -170,7 +170,7 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy) /* initialize data if there is a need for such */ if ((v2d->flag & V2D_IS_INITIALISED) == 0) { - /* set initialised flag so that View2D doesn't get reinitialised next time again */ + /* set initialized flag so that View2D doesn't get reinitialised next time again */ v2d->flag |= V2D_IS_INITIALISED; init= 1; diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 49dae81d985..e4726bf0ae4 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -1547,7 +1547,7 @@ static int scroller_activate_invoke(bContext *C, wmOperator *op, wmEvent *event) if ( ((vsm->scroller=='h') && (v2d->keepofs & V2D_LOCKOFS_X)) || ((vsm->scroller=='v') && (v2d->keepofs & V2D_LOCKOFS_Y)) ) { - /* free customdata initialised */ + /* free customdata initialized */ scroller_activate_exit(C, op); /* can't catch this event for ourselves, so let it go to someone else? */ @@ -1559,7 +1559,7 @@ static int scroller_activate_invoke(bContext *C, wmOperator *op, wmEvent *event) if ( ((vsm->scroller=='h') && (v2d->scroll & (V2D_SCROLL_HORIZONTAL_HIDE|V2D_SCROLL_HORIZONTAL_FULLR))) || ((vsm->scroller=='v') && (v2d->scroll & (V2D_SCROLL_VERTICAL_HIDE|V2D_SCROLL_VERTICAL_FULLR))) ) { - /* free customdata initialised */ + /* free customdata initialized */ scroller_activate_exit(C, op); /* can't catch this event for ourselves, so let it go to someone else? */ diff --git a/source/blender/editors/mesh/bmesh_utils.c b/source/blender/editors/mesh/bmesh_utils.c index 8ca5dce647f..ced878610c3 100644 --- a/source/blender/editors/mesh/bmesh_utils.c +++ b/source/blender/editors/mesh/bmesh_utils.c @@ -421,7 +421,7 @@ void EDBM_select_more(BMEditMesh *em) "regionextend geom=%hvef constrict=%b use_faces=%b", BM_ELEM_SELECT, FALSE, use_faces); BMO_op_exec(em->bm, &bmop); - /* dont flush selection in edge/vertex mode */ + /* don't flush selection in edge/vertex mode */ BMO_slot_buffer_hflag_enable(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_ALL, use_faces ? TRUE : FALSE); BMO_op_finish(em->bm, &bmop); @@ -437,7 +437,7 @@ void EDBM_select_less(BMEditMesh *em) "regionextend geom=%hvef constrict=%b use_faces=%b", BM_ELEM_SELECT, TRUE, use_faces); BMO_op_exec(em->bm, &bmop); - /* dont flush selection in edge/vertex mode */ + /* don't flush selection in edge/vertex mode */ BMO_slot_buffer_hflag_disable(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_ALL, use_faces ? TRUE : FALSE); BMO_op_finish(em->bm, &bmop); diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index bb000b2f8f5..cdbe34b4bd5 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -288,7 +288,7 @@ int ED_mesh_uv_loop_reset(struct bContext *C, struct Mesh *me) fuvs += len; } - /* BMESH_TODO: Copy poly UVs onto CD_MTFACE layer for tesselated faces */ + /* BMESH_TODO: Copy poly UVs onto CD_MTFACE layer for tessellated faces */ BLI_array_free(uvs); BLI_array_free(polylengths); @@ -762,7 +762,7 @@ void ED_mesh_update(Mesh *mesh, bContext *C, int calc_edges, int calc_tessface) if(mesh->totface > 0 && mesh->totpoly == 0) { convert_mfaces_to_mpolys(mesh); - /* would only be converting back again, dont bother */ + /* would only be converting back again, don't bother */ tessface_input = TRUE; /* it also happens that converting the faces calculates edges, skip this */ @@ -787,8 +787,8 @@ void ED_mesh_update(Mesh *mesh, bContext *C, int calc_edges, int calc_tessface) * calculate normals only for the mvert's. - campbell */ #ifdef USE_BMESH_MPOLY_NORMALS polyindex = CustomData_get_layer(&mesh->fdata, CD_POLYINDEX); - /* add a normals layer for tesselated faces, a tessface normal will - * contain the normal of the poly the face was tesselated from. */ + /* add a normals layer for tessellated faces, a tessface normal will + * contain the normal of the poly the face was tessellated from. */ face_nors = CustomData_add_layer(&mesh->fdata, CD_NORMAL, CD_CALLOC, NULL, mesh->totface); mesh_calc_normals_mapping_ex(mesh->mvert, mesh->totvert, @@ -870,7 +870,7 @@ static void mesh_add_edges(Mesh *mesh, int len) CustomData_free(&mesh->edata, mesh->totedge); mesh->edata= edata; - mesh_update_customdata_pointers(mesh, FALSE); /* new edges dont change tessellation */ + mesh_update_customdata_pointers(mesh, FALSE); /* new edges don't change tessellation */ /* set default flags */ medge= &mesh->medge[mesh->totedge]; diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 671c70c1f0f..2529b6f518f 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -1160,7 +1160,7 @@ static int pose_constraints_clear_exec(bContext *C, wmOperator *UNUSED(op)) /* force depsgraph to get recalculated since relationships removed */ DAG_scene_sort(bmain, scene); /* sort order of objects */ - /* note, calling BIK_clear_data() isnt needed here */ + /* note, calling BIK_clear_data() isn't needed here */ /* do updates */ DAG_id_tag_update(&ob->id, OB_RECALC_DATA); diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index f1222ccf7f7..dea9c1a3b6c 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -553,7 +553,7 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob, } cu = ob->data; - BKE_report(reports, RPT_INFO, "Applied modifier only changed CV points, not tesselated/bevel vertices"); + BKE_report(reports, RPT_INFO, "Applied modifier only changed CV points, not tessellated/bevel vertices"); vertexCos = curve_getVertexCos(cu, &cu->nurb, &numVerts); mti->deformVerts(md, ob, NULL, vertexCos, numVerts, 0, 0); diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index b186f788bbf..87a058334c0 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -224,7 +224,7 @@ static int object_shape_key_mirror(bContext *C, Object *ob) /* half but found up odd value */ const int pntsu_half = (lt->pntsu / 2) + (lt->pntsu % 2); - /* currently editmode isnt supported by mesh so + /* currently editmode isn't supported by mesh so * ignore here for now too */ /* if(lt->editlatt) lt= lt->editlatt->latt; */ diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index d66f16b0adb..57cc034aaaa 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -645,7 +645,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } else { - /* get the view settings if 'around' isnt set and the view is available */ + /* get the view settings if 'around' isn't set and the view is available */ View3D *v3d= CTX_wm_view3d(C); copy_v3_v3(cursor, give_cursor(scene, v3d)); if(v3d && !RNA_struct_property_is_set(op->ptr, "center")) diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 7328cbb2e7a..1e4d32de003 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -2783,7 +2783,7 @@ static int vgroup_do_remap(Object *ob, char *name_array, wmOperator *op) } } else { - BKE_report(op->reports, RPT_ERROR, "Editmode lattice isnt supported yet"); + BKE_report(op->reports, RPT_ERROR, "Editmode lattice isn't supported yet"); MEM_freeN(sort_map_update); return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index e17ce84406b..dbdee3baca8 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -674,7 +674,7 @@ static int fluid_init_filepaths(Object *fsDomain, char *targetDir, char *targetF BLI_strncpy(newSurfdataPath, domainSettings->surfdataPath, FILE_MAXDIR); /* if 0'd out below, this value is never used! */ BLI_path_abs(targetDir, relbase); // fixed #frame-no - /* .tmp: dont overwrite/delete original file */ + /* .tmp: don't overwrite/delete original file */ BLI_join_dirfile(targetFile, FILE_MAX, targetDir, suffixConfigTmp); // make sure all directories exist @@ -993,7 +993,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor } /* ******** start writing / exporting ******** */ - // use .tmp, dont overwrite/delete original file + // use .tmp, don't overwrite/delete original file BLI_join_dirfile(targetFile, sizeof(targetFile), targetDir, suffixConfigTmp); // make sure these directories exist as well diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 4fbc5085b2d..c104b498095 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -609,7 +609,7 @@ void RENDER_OT_render(wmOperatorType *ot) ot->modal= screen_render_modal; ot->exec= screen_render_exec; - /*ot->poll= ED_operator_screenactive;*/ /* this isnt needed, causes failer in background mode */ + /*ot->poll= ED_operator_screenactive;*/ /* this isn't needed, causes failer in background mode */ RNA_def_boolean(ot->srna, "animation", 0, "Animation", "Render files from the animation range of this scene"); RNA_def_boolean(ot->srna, "write_still", 0, "Write Image", "Save rendered the image to the output path (used only when animation is disabled)"); diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 79832e2a9d1..c36ec5a90dd 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -439,7 +439,7 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op) Object *camera= NULL; /* update animated image textures for gpu, etc, - * call before scene_update_for_newframe so modifiers with textuers dont lag 1 frame */ + * call before scene_update_for_newframe so modifiers with textuers don't lag 1 frame */ ED_image_update_frame(bmain, scene->r.cfra); /* go to next frame */ diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 57b65ad5223..d744149bf9c 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1703,7 +1703,7 @@ void ED_region_panels_init(wmWindowManager *wm, ARegion *ar) ar->v2d.scroll &= ~V2D_SCROLL_VERTICAL_HIDE; ar->v2d.keepzoom |= V2D_KEEPZOOM; - // correctly initialised User-Prefs? + // correctly initialized User-Prefs? if(!(ar->v2d.align & V2D_ALIGN_NO_POS_Y)) ar->v2d.flag &= ~V2D_IS_INITIALISED; diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 4ed6e08fb31..3f8f786489c 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1819,7 +1819,7 @@ void ED_update_for_newframe(Main *bmain, Scene *scene, bScreen *screen, int UNUS //extern void audiostream_scrub(unsigned int frame); /* seqaudio.c */ /* update animated image textures for gpu, etc, - * call before scene_update_for_newframe so modifiers with textuers dont lag 1 frame */ + * call before scene_update_for_newframe so modifiers with textuers don't lag 1 frame */ ED_image_update_frame(bmain, scene->r.cfra); ED_clip_update_frame(bmain, scene->r.cfra); diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index a2ad3c4480b..956251d7bb9 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -894,7 +894,7 @@ static int project_bucket_point_occluded(const ProjPaintState *ps, LinkNode *buc else isect_ret = project_paint_occlude_ptv(pixelScreenCo, ps->screenCoords[mf->v1], ps->screenCoords[mf->v2], ps->screenCoords[mf->v3], w, ps->is_ortho); - /* Note, if isect_ret==-1 then we dont want to test the other side of the quad */ + /* Note, if isect_ret==-1 then we don't want to test the other side of the quad */ if (isect_ret==0 && mf->v4) { if(do_clip) isect_ret = project_paint_occlude_ptv_clip(ps, mf, pixelScreenCo, ps->screenCoords[mf->v1], ps->screenCoords[mf->v3], ps->screenCoords[mf->v4], 1); @@ -1352,7 +1352,7 @@ static void project_face_pixel(const MTFace *tf_other, ImBuf *ibuf_other, const } -/* run this outside project_paint_uvpixel_init since pixels with mask 0 dont need init */ +/* run this outside project_paint_uvpixel_init since pixels with mask 0 don't need init */ static float project_paint_uvpixel_mask( const ProjPaintState *ps, const int face_index, @@ -1452,7 +1452,7 @@ static float project_paint_uvpixel_mask( } // This only works when the opacity dosnt change while painting, stylus pressure messes with this - // so dont use it. + // so don't use it. // if (ps->is_airbrush==0) mask *= brush_alpha(ps->brush); return mask; @@ -1506,7 +1506,7 @@ static ProjPixel *project_paint_uvpixel_init( projPixel->origColor.uint = projPixel->newColor.uint = *projPixel->pixel.uint_pt; } - /* screenspace unclamped, we could keep its z and w values but dont need them at the moment */ + /* screenspace unclamped, we could keep its z and w values but don't need them at the moment */ copy_v2_v2(projPixel->projCoSS, pixelScreenCo); projPixel->x_px = x_px; @@ -1745,7 +1745,7 @@ static int line_clip_rect2f( /* scale the quad & tri about its center * scaling by PROJ_FACE_SCALE_SEAM (0.99x) is used for getting fake UV pixel coords that are on the - * edge of the face but slightly inside it occlusion tests dont return hits on adjacent faces */ + * edge of the face but slightly inside it occlusion tests don't return hits on adjacent faces */ #ifndef PROJ_DEBUG_NOSEAMBLEED static void scale_quad(float insetCos[4][3], float *origCos[4], const float inset) { @@ -1984,7 +1984,7 @@ static void project_bucket_clip_face( inside_bucket_flag |= BLI_in_rctf(bucket_bounds, v3coSS[0], v3coSS[1]) << 2; if (inside_bucket_flag == ISECT_ALL3) { - /* all screenspace points are inside the bucket bounding box, this means we dont need to clip and can simply return the UVs */ + /* all screenspace points are inside the bucket bounding box, this means we don't need to clip and can simply return the UVs */ if (flip) { /* facing the back? */ copy_v2_v2(bucket_bounds_uv[0], uv3co); copy_v2_v2(bucket_bounds_uv[1], uv2co); @@ -2641,7 +2641,7 @@ static void project_paint_face_init(const ProjPaintState *ps, const int thread_i else { barycentric_weights_v2(tf_uv_pxoffset[0], tf_uv_pxoffset[1], tf_uv_pxoffset[2], uv_close, w); } -#else /* this is buggy with quads, dont use for now */ +#else /* this is buggy with quads, don't use for now */ /* Cheat, we know where we are along the edge so work out the weights from that */ fac = fac1 + (fac * (fac2-fac1)); @@ -2852,7 +2852,7 @@ static int project_bucket_face_isect(ProjPaintState *ps, int bucket_x, int bucke return 0; } -/* Add faces to the bucket but dont initialize its pixels +/* Add faces to the bucket but don't initialize its pixels * TODO - when painting occluded, sort the faces on their min-Z and only add faces that faces that are not occluded */ static void project_paint_delayed_face_init(ProjPaintState *ps, const MFace *mf, const int face_index) { @@ -3509,7 +3509,7 @@ static void project_paint_end(ProjPaintState *ps) if(ps->dm->type != DM_TYPE_CDDM) { if(ps->dm_mvert) MEM_freeN(ps->dm_mvert); if(ps->dm_mface) MEM_freeN(ps->dm_mface); - /* looks like these dont need copying */ + /* looks like these don't need copying */ #if 0 if(ps->dm_mtface) MEM_freeN(ps->dm_mtface); if(ps->dm_mtface_clone) MEM_freeN(ps->dm_mtface_clone); @@ -3593,7 +3593,7 @@ static int project_bucket_iter_init(ProjPaintState *ps, const float mval_f[2]) float min_brush[2], max_brush[2]; const float radius = (float)brush_size(ps->scene, ps->brush); - /* so we dont have a bucket bounds that is way too small to paint into */ + /* so we don't have a bucket bounds that is way too small to paint into */ // if (radius < 1.0f) radius = 1.0f; // this doesn't work yet :/ min_brush[0] = mval_f[0] - radius; @@ -3964,12 +3964,12 @@ static void *do_projectpaint_thread(void *ph_v) case PAINT_TOOL_CLONE: if (is_floatbuf) { if (((ProjPixelClone *)projPixel)->clonepx.f[3]) { - do_projectpaint_clone_f(ps, projPixel, alpha, mask); /* rgba isnt used for cloning, only alpha */ + do_projectpaint_clone_f(ps, projPixel, alpha, mask); /* rgba isn't used for cloning, only alpha */ } } else { if (((ProjPixelClone*)projPixel)->clonepx.ch[3]) { - do_projectpaint_clone(ps, projPixel, alpha, mask); /* rgba isnt used for cloning, only alpha */ + do_projectpaint_clone(ps, projPixel, alpha, mask); /* rgba isn't used for cloning, only alpha */ } } break; @@ -4711,7 +4711,7 @@ typedef struct PaintOperation { int first; int prevmouse[2]; - float prev_pressure; /* need this since we dont get tablet events for pressure change */ + float prev_pressure; /* need this since we don't get tablet events for pressure change */ int orig_brush_size; double starttime; @@ -4880,7 +4880,7 @@ static int texture_paint_init(bContext *C, wmOperator *op) if (pop->ps.ob==NULL || !(pop->ps.ob->lay & pop->ps.v3d->lay)) return 0; - /* Dont allow brush size below 2 */ + /* Don't allow brush size below 2 */ if (brush_size(scene, brush) < 2) brush_set_size(scene, brush, 2); diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 68153c6e760..3a6a9dd6548 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -103,7 +103,7 @@ static int vertex_paint_use_fast_update_check(Object *ob) } /* if the polygons from the mesh and the 'derivedFinal' match - * we can assume that no modifiers are applied and that its worth adding tesselated faces + * we can assume that no modifiers are applied and that its worth adding tessellated faces * so 'vertex_paint_use_fast_update_check()' returns TRUE */ static int vertex_paint_use_tessface_check(Object *ob) { @@ -189,7 +189,7 @@ unsigned int vpaint_get_current_col(VPaint *vp) Brush *brush = paint_brush(&vp->paint); unsigned char col[4]; rgb_float_to_uchar(col, brush->rgb); - col[3] = 255; /* alpha isnt used, could even be removed to speedup paint a little */ + col[3] = 255; /* alpha isn't used, could even be removed to speedup paint a little */ return *(unsigned int *)col; } @@ -2177,7 +2177,7 @@ static int wpaint_stroke_test_start(bContext *C, wmOperator *op, wmEvent *UNUSED ED_vgroup_add(ob); } - /* ensure we dont try paint onto an invalid group */ + /* ensure we don't try paint onto an invalid group */ if (ob->actdef <= 0) { BKE_report(op->reports, RPT_WARNING, "No active vertex group for painting, aborting"); return FALSE; @@ -2251,7 +2251,7 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P const float brush_alpha_value = brush_alpha(scene, brush); const float brush_alpha_pressure = brush_alpha_value * (brush_use_alpha_pressure(scene, brush) ? pressure : 1.0f); - /* intentionally dont initialize as NULL, make sure we initialize all members below */ + /* intentionally don't initialize as NULL, make sure we initialize all members below */ WeightPaintInfo wpi; /* cannot paint if there is no stroke data */ @@ -2415,7 +2415,7 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P /* *** free wpi members */ MEM_freeN((void *)wpi.defbase_sel); - /* *** dont freeing wpi members */ + /* *** don't freeing wpi members */ swap_m4m4(vc->rv3d->persmat, mat); diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c index b52bc75eac8..36bb10ec21f 100644 --- a/source/blender/editors/space_console/console_ops.c +++ b/source/blender/editors/space_console/console_ops.c @@ -614,7 +614,7 @@ static int console_history_append_exec(bContext *C, wmOperator *op) ARegion *ar= CTX_wm_region(C); ScrArea *sa= CTX_wm_area(C); ConsoleLine *ci= console_history_verify(C); - char *str= RNA_string_get_alloc(op->ptr, "text", NULL, 0); /* own this text in the new line, dont free */ + char *str= RNA_string_get_alloc(op->ptr, "text", NULL, 0); /* own this text in the new line, don't free */ int cursor= RNA_int_get(op->ptr, "current_character"); short rem_dupes= RNA_boolean_get(op->ptr, "remove_duplicates"); int prev_len= ci->len; @@ -671,7 +671,7 @@ static int console_scrollback_append_exec(bContext *C, wmOperator *op) ARegion *ar= CTX_wm_region(C); ConsoleLine *ci; - char *str= RNA_string_get_alloc(op->ptr, "text", NULL, 0); /* own this text in the new line, dont free */ + char *str= RNA_string_get_alloc(op->ptr, "text", NULL, 0); /* own this text in the new line, don't free */ int type= RNA_enum_get(op->ptr, "type"); console_history_verify(C); diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index f0baa6acf8c..5bc62620dfa 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -677,7 +677,7 @@ int filelist_find(struct FileList* filelist, const char *filename) for (i = 0; i < filelist->numfiles; ++i) { - if ( strcmp(filelist->filelist[i].relname, filename) == 0) { /* not dealing with user input so dont need BLI_path_cmp */ + if ( strcmp(filelist->filelist[i].relname, filename) == 0) { /* not dealing with user input so don't need BLI_path_cmp */ index = i; break; } diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index 46de1254f41..3c2ebea5c28 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -80,7 +80,7 @@ static void image_verify_buffer_float(Image *ima, ImBuf *ibuf, int color_manage) { /* detect if we need to redo the curve map. * ibuf->rect is zero for compositor and render results after change - * convert to 32 bits always... drawing float rects isnt supported well (atis) + * convert to 32 bits always... drawing float rects isn't supported well (atis) * * NOTE: if float buffer changes, we have to manually remove the rect */ diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index ae47125fa84..6271dbece35 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1069,7 +1069,7 @@ static int save_image_options_init(SaveImageOptions *simopts, SpaceImage *sima, simopts->im_format.depth= imtype_best_depth(ibuf, simopts->im_format.imtype); } - /* some formats dont use quality so fallback to scenes quality */ + /* some formats don't use quality so fallback to scenes quality */ if (simopts->im_format.quality == 0) { simopts->im_format.quality= scene->r.im_format.quality; } diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 46850d4ff60..3d5dc454768 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -673,7 +673,7 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN BLI_strncpy(showname, nodeLabel(node), sizeof(showname)); //if(node->flag & NODE_MUTED) - // BLI_snprintf(showname, sizeof(showname), "[%s]", showname); // XXX - dont print into self! + // BLI_snprintf(showname, sizeof(showname), "[%s]", showname); // XXX - don't print into self! uiDefBut(node->block, LABEL, 0, showname, (short)(rct->xmin+15), (short)(rct->ymax-NODE_DY), (int)(iconofs - rct->xmin-18.0f), NODE_DY, NULL, 0, 0, 0, 0, ""); @@ -831,7 +831,7 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b BLI_strncpy(showname, nodeLabel(node), sizeof(showname)); //if(node->flag & NODE_MUTED) - // BLI_snprintf(showname, sizeof(showname), "[%s]", showname); // XXX - dont print into self! + // BLI_snprintf(showname, sizeof(showname), "[%s]", showname); // XXX - don't print into self! uiDefBut(node->block, LABEL, 0, showname, (short)(rct->xmin+15), (short)(centy-10), (int)(rct->xmax - rct->xmin-18.0f -12.0f), NODE_DY, NULL, 0, 0, 0, 0, ""); diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 235e8e6c605..4adbd32cf37 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -2168,7 +2168,7 @@ static int node_duplicate_exec(bContext *C, wmOperator *op) newnode = nodeCopyNode(ntree, node); if(newnode->id) { - /* simple id user adjustment, node internal functions dont touch this + /* simple id user adjustment, node internal functions don't touch this * but operators and readfile.c do. */ id_us_plus(newnode->id); /* to ensure redraws or rerenders happen */ diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index f0115170525..12b93e17f9f 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1217,7 +1217,7 @@ static void outliner_draw_iconrow(bContext *C, uiBlock *block, Scene *scene, Spa (*offsx) += UI_UNIT_X; } - /* this tree element always has same amount of branches, so dont draw */ + /* this tree element always has same amount of branches, so don't draw */ if(tselem->type!=TSE_R_LAYER) outliner_draw_iconrow(C, block, scene, soops, &te->subtree, level+1, xmax, offsx, ys); } @@ -1251,7 +1251,7 @@ static void outliner_draw_tree_element(bContext *C, uiBlock *block, Scene *scene if(*starty+2*UI_UNIT_Y >= ar->v2d.cur.ymin && *starty<= ar->v2d.cur.ymax) { int xmax= ar->v2d.cur.xmax; - /* icons can be ui buts, we dont want it to overlap with restrict */ + /* icons can be ui buts, we don't want it to overlap with restrict */ if((soops->flag & SO_HIDE_RESTRICTCOLS)==0) xmax-= OL_TOGW+UI_UNIT_X; @@ -1393,7 +1393,7 @@ static void outliner_draw_tree_element(bContext *C, uiBlock *block, Scene *scene if(!TSELEM_OPEN(tselem,soops)) { if(te->subtree.first) { if(tselem->type==0 && te->idcode==ID_SCE); - else if(tselem->type!=TSE_R_LAYER) { /* this tree element always has same amount of branches, so dont draw */ + else if(tselem->type!=TSE_R_LAYER) { /* this tree element always has same amount of branches, so don't draw */ int tempx= startx+offsx; // divider diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index b44e363090f..c7587935cb3 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -413,7 +413,7 @@ void outliner_do_object_operation(bContext *C, Scene *scene_act, SpaceOops *soop } /* important to use 'scene_owner' not scene_act else deleting objects can crash. * only use 'scene_act' when 'scene_owner' is NULL, which can happen when the - * outliner isnt showing scenes: Visible Layer draw mode for eg. */ + * outliner isn't showing scenes: Visible Layer draw mode for eg. */ operation_cb(C, scene_owner ? scene_owner : scene_act, te, NULL, tselem); } } diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 56cfcf9e18a..d8a9e75ebc6 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1284,7 +1284,7 @@ static void outliner_sort(SpaceOops *soops, ListBase *lb) tp->te= te; tp->name= te->name; tp->idcode= te->idcode; - if(tselem->type && tselem->type!=TSE_DEFGROUP) tp->idcode= 0; // dont sort this + if(tselem->type && tselem->type!=TSE_DEFGROUP) tp->idcode= 0; // don't sort this tp->id= tselem->id; } /* keep beginning of list */ diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 96e837eb95b..e4df13bc00c 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -123,7 +123,7 @@ static void sequencer_generic_invoke_xy__internal(bContext *C, wmOperator *op, w UI_view2d_region_to_view(v2d, event->mval[0], event->mval[1], &mval_v2d[0], &mval_v2d[1]); - /* effect strips dont need a channel initialized from the mouse */ + /* effect strips don't need a channel initialized from the mouse */ if(!(flag & SEQPROP_NOCHAN)) { RNA_int_set(op->ptr, "channel", (int)mval_v2d[1]+0.5f); } @@ -149,7 +149,7 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, wmOperator *op) seq_load->end_frame= seq_load->start_frame; /* un-set */ seq_load->channel= RNA_int_get(op->ptr, "channel"); - seq_load->len= 1; // images only, if endframe isnt set! + seq_load->len= 1; // images only, if endframe isn't set! if(RNA_struct_find_property(op->ptr, "filepath")) { RNA_string_get(op->ptr, "filepath", seq_load->path); /* full path, file is set by the caller */ diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 1bbf4b670b5..a9c32b4dfde 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -72,7 +72,7 @@ #define SEQ_RIGHTHANDLE 2 -/* Note, Dont use SEQ_BEGIN/SEQ_END while drawing! +/* Note, Don't use SEQ_BEGIN/SEQ_END while drawing! * it messes up transform, - Campbell */ static void draw_shadedstrip(Sequence *seq, unsigned char col[3], float x1, float y1, float x2, float y2); diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 049e11a4f6a..62bbe09c4d8 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -409,7 +409,7 @@ Sequence *find_nearest_seq(Scene *scene, View2D *v2d, int *hand, const int mval[ handsize = seq->handsize; displen = (float)abs(seq->startdisp - seq->enddisp); - if (displen / pixelx > 16) { /* dont even try to grab the handles of small strips */ + if (displen / pixelx > 16) { /* don't even try to grab the handles of small strips */ /* Set the max value to handle to 1/3 of the total len when its less then 28. * This is important because otherwise selecting handles happens even when you click in the middle */ @@ -1051,7 +1051,7 @@ static int sequencer_snap_exec(bContext *C, wmOperator *op) } /* test for effects and overlap - * dont use SEQP_BEGIN since that would be recursive */ + * don't use SEQP_BEGIN since that would be recursive */ for(seq= ed->seqbasep->first; seq; seq= seq->next) { if(seq->flag & SELECT && !(seq->depth==0 && seq->flag & SEQ_LOCK)) { seq->flag &= ~SEQ_OVERLAP; @@ -1729,7 +1729,7 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) while (seq) { if((seq->flag & SELECT) && (seq->type == SEQ_IMAGE) && (seq->len > 1)) { - /* remove seq so overlap tests dont conflict, + /* remove seq so overlap tests don't conflict, * see seq_free_sequence below for the real free'ing */ BLI_remlink(ed->seqbasep, seq); /* if(seq->ipo) seq->ipo->id.us--; */ @@ -1981,7 +1981,7 @@ static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op)) recurs_del_seq_flag(scene, ed->seqbasep, SEQ_FLAG_DELETE, 0); /* test for effects and overlap - * dont use SEQP_BEGIN since that would be recursive */ + * don't use SEQP_BEGIN since that would be recursive */ for(seq= ed->seqbasep->first; seq; seq= seq->next) { if(seq->flag & SELECT) { seq->flag &= ~SEQ_OVERLAP; @@ -2871,7 +2871,7 @@ static int sequencer_change_effect_input_exec(bContext *C, wmOperator *op) update_changed_seq_and_deps(scene, seq, 0, 1); - /* important else we dont get the imbuf cache flushed */ + /* important else we don't get the imbuf cache flushed */ free_imbuf_seq(scene, &ed->seqbase, FALSE, FALSE); WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene); @@ -2931,7 +2931,7 @@ static int sequencer_change_effect_type_exec(bContext *C, wmOperator *op) /* update */ update_changed_seq_and_deps(scene, seq, 0, 1); - /* important else we dont get the imbuf cache flushed */ + /* important else we don't get the imbuf cache flushed */ free_imbuf_seq(scene, &ed->seqbase, FALSE, FALSE); WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene); @@ -2997,13 +2997,13 @@ static int sequencer_change_path_exec(bContext *C, wmOperator *op) /* reset these else we wont see all the images */ seq->anim_startofs= seq->anim_endofs= 0; - /* correct start/end frames so we dont move + /* correct start/end frames so we don't move * important not to set seq->len= len; allow the function to handle it */ reload_sequence_new_file(scene, seq, TRUE); calc_sequence(scene, seq); - /* important else we dont get the imbuf cache flushed */ + /* important else we don't get the imbuf cache flushed */ free_imbuf_seq(scene, &ed->seqbase, FALSE, FALSE); } else { diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 32ccccd84d0..44b83ba0694 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -536,7 +536,7 @@ void SEQUENCER_OT_select(wmOperatorType *ot) /* properties */ RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the selection"); RNA_def_boolean(ot->srna, "linked_handle", 0, "Linked Handle", "Select handles next to the active strip"); - /* for animation this is an enum but atm having an enum isnt useful for us */ + /* for animation this is an enum but atm having an enum isn't useful for us */ RNA_def_boolean(ot->srna, "left_right", 0, "Left/Right", "Select based on the current frame side the cursor is on"); RNA_def_boolean(ot->srna, "linked_time", 0, "Linked Time", "Select other strips at the same time"); } diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index e9062b052e6..1c8ff4639cf 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -1615,7 +1615,7 @@ static void draw_brackets(SpaceText *st, ARegion *ar) find= -b; stack= 0; - /* Dont highlight backets if syntax HL is off or bracket in string or comment. */ + /* Don't highlight backets if syntax HL is off or bracket in string or comment. */ if(!linep->format || linep->format[fc] == 'l' || linep->format[fc] == '#') return; @@ -1854,7 +1854,7 @@ void text_update_character_width(SpaceText *st) } /* Moves the view to the cursor location, - * also used to make sure the view isnt outside the file */ + * also used to make sure the view isn't outside the file */ void text_scroll_to_cursor(SpaceText *st, ScrArea *sa) { Text *text; diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 17857275d36..2f6e5082fdc 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -598,7 +598,7 @@ static int text_run_script(bContext *C, ReportList *reports) return OPERATOR_FINISHED; } - /* Dont report error messages while live editing */ + /* Don't report error messages while live editing */ if(!is_live) { if(text->curl != curl_prev || curc_prev != text->curc) { text_update_cursor_moved(C); @@ -1109,7 +1109,7 @@ static int text_convert_whitespace_exec(bContext *C, wmOperator *op) for(a=0; a < strlen(text_check_line); a++) { //foreach char in line if(text_check_line[a] == '\t') { //checking for tabs //get the number of spaces this tabs is showing - //i dont like doing it this way but will look into it later + //i don't like doing it this way but will look into it later new_line[j] = '\0'; number = flatten_string(st, &fs, new_line); flatten_string_free(&fs); diff --git a/source/blender/editors/space_view3d/drawanimviz.c b/source/blender/editors/space_view3d/drawanimviz.c index e15252056cc..545ec42e72f 100644 --- a/source/blender/editors/space_view3d/drawanimviz.c +++ b/source/blender/editors/space_view3d/drawanimviz.c @@ -79,7 +79,7 @@ void draw_motion_paths_init(View3D *v3d, ARegion *ar) } /* Draw the given motion path for an Object or a Bone - * - assumes that the viewport has already been initialised properly + * - assumes that the viewport has already been initialized properly * i.e. draw_motion_paths_init() has been called */ void draw_motion_path_instance(Scene *scene, @@ -210,7 +210,7 @@ void draw_motion_path_instance(Scene *scene, UI_ThemeColor(TH_TEXT_HI); } - // XXX, this isnt up to date but probably should be kept so. + // XXX, this isn't up to date but probably should be kept so. invert_m4_m4(ob->imat, ob->obmat); /* Draw frame numbers at each framestep value */ diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 373b665a84c..0f3110c478f 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -1864,7 +1864,7 @@ static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base, if (index != -1) index+= 0x10000; // pose bones count in higher 2 bytes only } - /* stick or wire bones have not been drawn yet so dont clear object selection in this case */ + /* stick or wire bones have not been drawn yet so don't clear object selection in this case */ if (ELEM(arm->drawtype, ARM_LINE, ARM_WIRE)==0 && draw_wire) { /* object tag, for bordersel optim */ glLoadName(index & 0xFFFF); diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 765114e2fb4..a8f5aff2e1c 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -193,7 +193,7 @@ static int check_ob_drawface_dot(Scene *sce, View3D *vd, char dt) if ((vd->flag & V3D_ZBUF_SELECT) == 0) return 1; - /* if its drawing textures with zbuf sel, then dont draw dots */ + /* if its drawing textures with zbuf sel, then don't draw dots */ if (dt==OB_TEXTURE && vd->drawtype==OB_TEXTURE) return 0; @@ -2016,7 +2016,7 @@ static void drawlattice(Scene *scene, View3D *v3d, Object *ob) /* Note! - foreach funcs should be called while drawing or directly after * if not, ED_view3d_init_mats_rv3d() can be used for selection tools - * but would not give correct results with dupli's for eg. which dont + * but would not give correct results with dupli's for eg. which don't * use the object matrix in the usual way */ static void mesh_foreachScreenVert__mapFunc(void *userData, int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s)) { @@ -2721,7 +2721,7 @@ static void draw_em_fancy_edges(BMEditMesh *em, Scene *scene, View3D *v3d, UI_GetThemeColor4ubv(TH_WIRE, wireCol); UI_GetThemeColor4ubv(TH_EDITMESH_ACTIVE, actCol); - /* when sel only is used, dont render wire, only selected, this is used for + /* when sel only is used, don't render wire, only selected, this is used for * textured draw mode when the 'edges' option is disabled */ if (sel_only) wireCol[3] = 0; @@ -3084,7 +3084,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, glEnable(GL_BLEND); glDepthMask(0); // disable write in zbuffer, needed for nice transp - /* dont draw unselected faces, only selected, this is MUCH nicer when texturing */ + /* don't draw unselected faces, only selected, this is MUCH nicer when texturing */ if (CHECK_OB_DRAWTEXTURE(v3d, dt)) col1[3] = 0; @@ -3098,7 +3098,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, * Make all other faces zero alpha except for the active * */ unsigned char col1[4], col2[4], col3[4]; - col1[3] = col2[3] = 0; /* dont draw */ + col1[3] = col2[3] = 0; /* don't draw */ UI_GetThemeColor4ubv(TH_EDITMESH_ACTIVE, col3); glEnable(GL_BLEND); @@ -3113,7 +3113,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, /* here starts all fancy draw-extra over */ if ((me->drawflag & ME_DRAWEDGES)==0 && CHECK_OB_DRAWTEXTURE(v3d, dt)) { - /* we are drawing textures and 'ME_DRAWEDGES' is disabled, dont draw any edges */ + /* we are drawing textures and 'ME_DRAWEDGES' is disabled, don't draw any edges */ /* only draw selected edges otherwise there is no way of telling if a face is selected */ draw_em_fancy_edges(em, scene, v3d, me, cageDM, 1, eed_act); @@ -3318,7 +3318,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D GPU_disable_material(); - /* since we already draw wire as wp guide, dont draw over the top */ + /* since we already draw wire as wp guide, don't draw over the top */ draw_wire= OBDRAW_WIRE_OFF; } else if (draw_flags & DRAW_MODIFIERS_PREVIEW) { @@ -5135,7 +5135,7 @@ static void tekenhandlesN(Nurb *nu, short sel, short hide_handles) if (nu->type == CU_BEZIER) { #define TH_HANDLE_COL_TOT ((TH_HANDLE_SEL_FREE - TH_HANDLE_FREE) + 1) - /* use MIN2 when indexing to ensure newer files dont read outside the array */ + /* use MIN2 when indexing to ensure newer files don't read outside the array */ unsigned char handle_cols[TH_HANDLE_COL_TOT][3]; const int basecol= sel ? TH_HANDLE_SEL_FREE : TH_HANDLE_FREE; @@ -5510,7 +5510,7 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, if (v3d->zbuf) glEnable(GL_DEPTH_TEST); /* direction vectors for 3d curve paths - * when at its lowest, dont render normals */ + * when at its lowest, don't render normals */ if ((cu->flag & CU_3D) && (ts->normalsize > 0.0015f) && (cu->drawflag & CU_HIDE_NORMALS)==0) { UI_ThemeColor(TH_WIRE); @@ -6945,7 +6945,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) } if (dtx & OB_DRAWNAME) { /* patch for several 3d cards (IBM mostly) that crash on glSelect with text drawing */ - /* but, we also dont draw names for sets or duplicators */ + /* but, we also don't draw names for sets or duplicators */ if (flag == 0) { float zero[3]= {0,0,0}; float curcol[4]; @@ -6999,7 +6999,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) int do_draw_center= -1; /* defines below are zero or positive... */ if (v3d->flag2 & V3D_RENDER_OVERRIDE) { - /* dont draw */ + /* don't draw */ } else if ((scene->basact)==base) do_draw_center= ACTIVE; diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 3d570252126..dbd4a4107f8 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -541,7 +541,7 @@ static void drawcursor(Scene *scene, ARegion *ar, View3D *v3d) int mx, my, co[2]; int flag; - /* we dont want the clipping for cursor */ + /* we don't want the clipping for cursor */ flag= v3d->flag; v3d->flag= 0; project_int(ar, give_cursor(scene, v3d), co); @@ -2097,7 +2097,7 @@ void draw_depth(Scene *scene, ARegion *ar, View3D *v3d, int (* func)(void *)) } } - /* this isnt that nice, draw xray objects as if they are normal */ + /* this isn't that nice, draw xray objects as if they are normal */ if ( v3d->afterdraw_transp.first || v3d->afterdraw_xray.first || v3d->afterdraw_xraytransp.first diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index e27cd760c92..c04f352a5d0 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -476,7 +476,7 @@ static void viewops_data_create(bContext *C, wmOperator *op, wmEvent *event) ED_view3d_win_to_vector(vod->ar, mval_f, vod->mousevec); } - /* lookup, we dont pass on v3d to prevent confusement */ + /* lookup, we don't pass on v3d to prevent confusement */ vod->grid= vod->v3d->grid; vod->far= vod->v3d->far; @@ -2202,7 +2202,7 @@ static int viewselected_exec(bContext *C, wmOperator *UNUSED(op)) size= MAX3(afm[0], afm[1], afm[2]); if (!rv3d->is_persp) { - if (size < 0.0001f) { /* if its a sinble point. dont even re-scale */ + if (size < 0.0001f) { /* if its a sinble point. don't even re-scale */ ok_dist= 0; } else { @@ -2813,7 +2813,7 @@ static int viewnumpad_exec(bContext *C, wmOperator *op) } } - /* if the camera isnt found, check a number of options */ + /* if the camera isn't found, check a number of options */ if (v3d->camera==NULL && ob && ob->type==OB_CAMERA) v3d->camera= ob; @@ -2824,7 +2824,7 @@ static int viewnumpad_exec(bContext *C, wmOperator *op) if (v3d->camera==NULL) return OPERATOR_CANCELLED; - /* important these dont get out of sync for locked scenes */ + /* important these don't get out of sync for locked scenes */ if (v3d->scenelock) scene->camera= v3d->camera; diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 53b64b971aa..6e5a3b2dc54 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -813,7 +813,7 @@ static int flyApply(bContext *C, FlyInfo *fly) /* scale the mouse movement by this value - scales mouse movement to the view size * moffset[0]/(ar->winx-xmargin*2) - window size minus margin (same for y) * - * the mouse moves isnt linear */ + * the mouse moves isn't linear */ if (moffset[0]) { moffset[0] /= ar->winx - (xmargin * 2); @@ -834,7 +834,7 @@ static int flyApply(bContext *C, FlyInfo *fly) float dvec_tmp[3]; /* time how fast it takes for us to redraw, - * this is so simple scenes dont fly too fast */ + * this is so simple scenes don't fly too fast */ double time_current; float time_redraw; float time_redraw_clamped; @@ -946,12 +946,12 @@ static int flyApply(bContext *C, FlyInfo *fly) fly->zlock_momentum += FLY_ZUP_CORRECT_ACCEL; } else { - fly->zlock = 1; /* dont check until the view rotates again */ + fly->zlock = 1; /* don't check until the view rotates again */ fly->zlock_momentum = 0.0f; } } - if (fly->xlock == 2 && moffset[1] == 0) { /*only apply xcorrect when mouse isnt applying x rot*/ + if (fly->xlock == 2 && moffset[1] == 0) { /*only apply xcorrect when mouse isn't applying x rot*/ upvec[0] = 0; upvec[1] = 0; upvec[2] = 1; diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 17f5ab68633..6e0a87977ee 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -527,7 +527,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) uiItemR(row, &v3dptr, "pivot_point", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); /* pose/object only however we want to allow in weight paint mode too - * so dont be totally strict and just check not-editmode for now */ + * so don't be totally strict and just check not-editmode for now */ if (obedit == NULL) { uiItemR(row, &v3dptr, "use_pivot_point_align", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); } diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 3d1156c8ad1..a7c711968aa 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -529,7 +529,7 @@ static void do_lasso_select_mesh(ViewContext *vc, int mcords[][2], short moves, if (extend == 0 && select) EDBM_flag_disable_all(vc->em, BM_ELEM_SELECT); - /* for non zbuf projections, dont change the GL state */ + /* for non zbuf projections, don't change the GL state */ ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); glLoadMatrixf(vc->rv3d->viewmat); @@ -1086,7 +1086,7 @@ static EnumPropertyItem *object_select_menu_enum_itemf(bContext *C, PointerRNA * int totitem= 0; int i= 0; - /* dont need context but avoid docgen using this */ + /* don't need context but avoid docgen using this */ if (C == NULL || object_mouse_select_menu_data[i].idname[0] == '\0') { return DummyRNA_NULL_items; } @@ -1800,7 +1800,7 @@ static int do_mesh_box_select(ViewContext *vc, rcti *rect, int select, int exten if (extend == 0 && select) EDBM_flag_disable_all(vc->em, BM_ELEM_SELECT); - /* for non zbuf projections, dont change the GL state */ + /* for non zbuf projections, don't change the GL state */ ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); glLoadMatrixf(vc->rv3d->viewmat); diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 88658b30662..7bd878351d9 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -145,7 +145,7 @@ void smooth_view(bContext *C, View3D *v3d, ARegion *ar, Object *oldcamera, Objec * we may be changing the view 'as if' there is no active camera, but infact * there is an active camera which is locked to the view. * - * In the case where smooth view is moving _to_ a camera we dont want that + * In the case where smooth view is moving _to_ a camera we don't want that * camera to be moved or changed, so only when the camera is not being set should * we allow camera option locking to initialize the view settings from the camera. */ @@ -1075,7 +1075,7 @@ static void obmat_to_viewmat(View3D *v3d, RegionView3D *rv3d, Object *ob, short float bmat[4][4]; float tmat[3][3]; - rv3d->view= RV3D_VIEW_USER; /* dont show the grid */ + rv3d->view= RV3D_VIEW_USER; /* don't show the grid */ copy_m4_m4(bmat, ob->obmat); normalize_m4(bmat); @@ -1150,7 +1150,7 @@ int ED_view3d_lock(RegionView3D *rv3d) return TRUE; } -/* dont set windows active in here, is used by renderwin too */ +/* don't set windows active in here, is used by renderwin too */ void setviewmatrixview3d(Scene *scene, View3D *v3d, RegionView3D *rv3d) { if (rv3d->persp==RV3D_CAMOB) { /* obs/camera */ diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index c62bac7d5c7..4382889ff74 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4665,7 +4665,7 @@ void projectSVData(TransInfo *t, int final) /* BMESH_TODO, (t->settings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT) * currently all vertex data is interpolated which is nice mostly - * except for shape keys where you dont want to modify UVs for eg. + * except for shape keys where you don't want to modify UVs for eg. * current BMesh code doesnt make it easy to pick which data we interpolate * - campbell */ diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 595edf053b8..20a51945b95 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -1585,7 +1585,7 @@ static void createTransCurveVerts(bContext *C, TransInfo *t) calc_distanceCurveVerts(head, tail-1); /* TODO - in the case of tilt and radius we can also avoid allocating the initTransDataCurveHandles - * but for now just dont change handle types */ + * but for now just don't change handle types */ if (ELEM(t->mode, TFM_CURVE_SHRINKFATTEN, TFM_TILT) == 0) { /* sets the handles based on their selection, do this after the data is copied to the TransData */ testhandlesNurb(nu); @@ -2337,7 +2337,7 @@ void flushTransSeq(TransInfo *t) if(seq->depth==0) { /* Calculate this strip and all nested strips * children are ALWAYS transformed first - * so we dont need to do this in another loop. */ + * so we don't need to do this in another loop. */ calc_sequence(t->scene, seq); } else { @@ -3838,7 +3838,7 @@ void flushTransGraphData(TransInfo *t) /* ******************* Sequencer Transform data ******************* */ /* This function applies the rules for transforming a strip so duplicate - * checks dont need to be added in multiple places. + * checks don't need to be added in multiple places. * * recursive, count and flag MUST be set. * @@ -3918,7 +3918,7 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count /* Recursive */ if ((seq->type == SEQ_META) && ((seq->flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL)) == 0)) { - /* if any handles are selected, dont recurse */ + /* if any handles are selected, don't recurse */ *recursive = 1; } else { @@ -3936,8 +3936,8 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count #else if (seq->type == SEQ_META) { /* Meta's can only directly be moved between channels since they - * dont have their start and length set directly (children affect that) - * since this Meta is nested we dont need any of its data infact. + * don't have their start and length set directly (children affect that) + * since this Meta is nested we don't need any of its data infact. * calc_sequence() will update its settings when run on the toplevel meta */ *flag= 0; *count= 0; @@ -4732,7 +4732,7 @@ void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *o float cfra= (float)CFRA; short flag= 0; - /* flag is initialised from UserPref keyframing settings + /* flag is initialized from UserPref keyframing settings * - special exception for targetless IK - INSERTKEY_MATRIX keyframes should get * visual keyframes even if flag not set, as it's not that useful otherwise * (for quick animation recording) @@ -5255,7 +5255,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t) /* recalculating the frame positions means we loose our original transform if its not auto-keyed [#24451] * this hack re-applies it, which is annoying, only alternatives are... - * - dont recalc paths. + * - don't recalc paths. * - have an object_handle_update() which gives is the new transform without touching the objects. * - only recalc paths on auto-keying. * - ED_objects_recalculate_paths could backup/restore transforms. @@ -5991,7 +5991,7 @@ void createTransData(bContext *C, TransInfo *t) * transform ops redo clears sculpt/project undo stack. * * Could use 'OB_MODE_ALL_PAINT' since there are key conflicts, - * transform + paint isnt well supported. */ + * transform + paint isn't well supported. */ } else { createTransObject(C, t); diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index c2568100ac2..501aa93cfa6 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -1044,7 +1044,7 @@ static int select_edgeloop(Scene *scene, Image *ima, BMEditMesh *em, NearestHit starttotf= 0; uv_edge_tag_faces(em, iterv1, iterv2, &starttotf); - /* sorry, first edge isnt even ok */ + /* sorry, first edge isn't even ok */ if(iterv1->flag==0 && iterv2->flag==0) looking= 0; else looking= 1; @@ -1462,7 +1462,7 @@ static void weld_align_uv(bContext *C, int tool) /* walk over edges, building an array of verts in a line */ while (eve) { BLI_array_append(eve_line, eve); - /* dont touch again */ + /* don't touch again */ BM_elem_flag_disable(eve, BM_ELEM_TAG); eve_next = NULL; @@ -1737,7 +1737,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop) NearestHit hit; int i, select = 1, selectmode, sticky, sync, *hitv=NULL, nvert; BLI_array_declare(hitv); - int flush = 0, hitlen=0; /* 0 == dont flush, 1 == sel, -1 == desel; only use when selection sync is enabled */ + int flush = 0, hitlen=0; /* 0 == don't flush, 1 == sel, -1 == desel; only use when selection sync is enabled */ float limit[2], **hituv = NULL; BLI_array_declare(hituv); float penalty[2]; |