}
/* Make referenced file absolute. This would be a side-effect of
- * BLI_cleanup_file, but we do it explicitely so we know if it changed. */
+ * BLI_cleanup_file, but we do it explicitly so we know if it changed. */
BLI_strncpy(filepath, path_src, FILE_MAX);
if (BLI_path_abs(filepath, base_old)) {
/* Path was relative and is now absolute. Remap.
int i;
/* count the number of branches in this symmetry group
- * and determinte the axis of symmetry
+ * and determinate the axis of symmetry
* */
for (i = 0; i < node->degree; i++)
{
* what is a slice ?
* some maths:
* a line including l1,l2 and a point not on the line
- * define a subset of R3 delimeted by planes parallel to the line and orthogonal
+ * define a subset of R3 delimited by planes parallel to the line and orthogonal
* to the (point --> line) distance vector,one plane on the line one on the point,
* the room inside usually is rather small compared to R3 though still infinte
* useful for restricting (speeding up) searches
* name_offs: should be calculated using offsetof(structname, membername) macro from stddef.h
* len: maximum length of string (to prevent overflows, etc.)
* defname: the name that should be used by default if none is specified already
- * delim: the character which acts as a delimeter between parts of the name
+ * delim: the character which acts as a delimiter between parts of the name
*/
static int uniquename_find_dupe(ListBase *list, void *vlink, const char *name, short name_offs)
{
#if defined(_WIN32) && !defined(FREE_WINDOWS)
-/* The __intXX are built-in types of the visual complier! So we don't
+/* The __intXX are built-in types of the visual compiler! So we don't
* need to include anything else here. */
return OPERATOR_CANCELLED;
case RIGHTMOUSE:
- /* press = user manually demands transform to be cancelled */
+ /* press = user manually demands transform to be canceled */
if (evt->val == KM_PRESS) {
ed_marker_move_cancel(C, op);
return OPERATOR_CANCELLED;
/* add to buffer */
newbuf= MEM_callocN(sizeof(BezTriple)*(aci->totvert+1), "copybuf beztriple");
- /* assume that since we are just resizing the array, just copy all existing data across */
+ /* assume that since we are just re-sizing the array, just copy all existing data across */
if (aci->bezt)
memcpy(newbuf, aci->bezt, sizeof(BezTriple)*(aci->totvert));
/* if prompting or no active Keying Set, show the menu */
if ((scene->active_keyingset == 0) || RNA_boolean_get(op->ptr, "always_prompt")) {
- /* call the menu, which will call this operator again, hence the cancelled */
+ /* call the menu, which will call this operator again, hence the canceled */
ANIM_keying_sets_menu_setup(C, op->type->name, "ANIM_OT_keyframe_insert_menu");
return OPERATOR_CANCELLED;
}
static int keyingset_active_menu_invoke (bContext *C, wmOperator *op, wmEvent *UNUSED(event))
{
- /* call the menu, which will call this operator again, hence the cancelled */
+ /* call the menu, which will call this operator again, hence the canceled */
ANIM_keying_sets_menu_setup(C, op->type->name, "ANIM_OT_keying_set_active_set");
return OPERATOR_CANCELLED;
}
* - the context iterator contains both selected bones and their mirrored copies,
* so we assume that unselected bones are mirrored copies of some selected bone
* - since the active one (and/or its mirror) will also be selected, we also need
- * to check that we are not trying to opearate on them, since such an operation
+ * to check that we are not trying to operate on them, since such an operation
* would cause errors
*/
/* if the bone being aligned has connected descendants they must be moved
* according to their parent new position, otherwise they would be left
- * in an unconsistent state: connected but away from the parent*/
+ * in an inconsistent state: connected but away from the parent*/
fix_editbone_connected_children(edbo, selbone);
return;
}
* - the context iterator contains both selected bones and their mirrored copies,
* so we assume that unselected bones are mirrored copies of some selected bone
* - since the active one (and/or its mirror) will also be selected, we also need
- * to check that we are not trying to opearate on them, since such an operation
+ * to check that we are not trying to operate on them, since such an operation
* would cause errors
*/
/* investigate:
* - transpose R in orthogonal
* - flipped normals and per face adding
- * - move cancelling to transform, make origco pointer
+ * - move canceling to transform, make origco pointer
*/
static LaplacianSystem *RigidDeformSystem = NULL;
switch (pso->mode) {
case POSESLIDE_PUSH: /* make the current pose more pronounced */
{
- /* perform a weighted average here, favouring the middle pose
+ /* perform a weighted average here, favoring the middle pose
* - numerator should be larger than denominator to 'expand' the result
* - perform this weighting a number of times given by the percentage...
*/
case POSESLIDE_RELAX: /* make the current pose more like its surrounding ones */
{
- /* perform a weighted average here, favouring the middle pose
+ /* perform a weighted average here, favoring the middle pose
* - numerator should be smaller than denominator to 'relax' the result
* - perform this weighting a number of times given by the percentage...
*/
/* clean up temp data */
pose_slide_exit(op);
- /* cancelled! */
+ /* canceled! */
return OPERATOR_CANCELLED;
}
case MOUSEMOVE: /* calculate new position */
{
/* calculate percentage based on position of mouse (we only use x-axis for now.
- * since this is more conveninent for users to do), and store new percentage value
+ * since this is more convenient for users to do), and store new percentage value
*/
pso->percentage= (evt->x - pso->ar->winrct.xmin) / ((float)pso->ar->winx);
RNA_float_set(op->ptr, "percentage", pso->percentage);
/* this signal does one recalc on pose, then unlocks, so ESC or edit will work */
pose->flag |= POSE_DO_UNLOCK;
- /* clear pose if cancelled */
+ /* clear pose if canceled */
if (pld->state == PL_PREVIEW_CANCEL) {
poselib_backup_restore(pld);
*
* is an invariant for a single NURB curve. Raising the degree
* of the NURB is done elsewhere; the degree is assumed
- * constant during this opration. Degree is a property shared
+ * constant during this operation. Degree is a property shared
* by all controlpoints in a curve (even though it is stored
* per control point - this can be misleading).
* Adding a knot is done by searching for the place in the
return found;
}
-/* needed for temporarily rename buttons, such as in outliner or fileselect,
+/* needed for temporarily rename buttons, such as in outliner or file-select,
* they should keep calling uiDefButs to keep them alive */
/* returns 0 when button removed */
int uiButActiveOnly(const bContext *C, uiBlock *block, uiBut *but)
}
if(pass==0) {
- /* Skip to next delimeter on first pass (be picky) */
+ /* Skip to next delimiter on first pass (be picky) */
while(isalpha(*str_pt))
str_pt++;
void ui_set_but_soft_range(uiBut *but, double value)
{
- /* ideally we would not limit this but practially, its more then
+ /* 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. */
* to cancel changes made to this button, but changing state to EXIT also makes no button active for
* a while which leads to triggering operator when doing fast scrolling mouse wheel.
* using post activate stuff from button allows to make button be active again after checking for all
- * all that mouse leave and cancel stuff, so quick scroll wouldnt't be an issue anymore.
+ * all that mouse leave and cancel stuff, so quick scroll wouldn't be an issue anymore.
* same goes for scrolling wheel in another direction below (sergey)
*/
data->postbut= but;
/* if mouse moves outside of sphere, it does negative normal */
/* note that both data->vec and data->origvec should be normalized
- * else we'll get a hamrless but annoying jump when first clicking */
+ * else we'll get a harmless but annoying jump when first clicking */
fp= data->origvec;
rad= (but->x2 - but->x1);
static void ui_warp_pointer(int x, int y)
{
/* XXX 2.50 which function to use for this? */
- /* OSX has very poor mousewarp support, it sends events;
+ /* OSX has very poor mouse-warp support, it sends events;
* this causes a menu being pressed immediately ... */
- #ifndef __APPLE__
+# ifndef __APPLE__
warp_pointer(x, y);
- #endif
+# endif
}
#endif
}
}
-/* Intialise settings necessary for drawing gridlines in a 2d-view
+/* Initialize settings necessary for drawing gridlines in a 2d-view
* - Currently, will return pointer to View2DGrid struct that needs to
* be freed with UI_view2d_grid_free()
* - Is used for scrollbar drawing too (for units drawing)
int i;
/* when initializing cage verts, we only want the first cage coordinate for each vertex,
- * so that e.g. mirror or array use original vertex coordiantes and not mirrored or duplicate */
+ * so that e.g. mirror or array use original vertex coordinates and not mirrored or duplicate */
BLI_smallhash_init(&shash);
BMEdit_RecalcTessellation(em);
/* get the target objects, adding them as need be */
if (get_new_constraint_target(C, type, &tar_ob, &tar_pchan, 1)) {
/* method of setting target depends on the type of target we've got
- * - by default, just set the first target (distinction here is only for multiple-targetted constraints)
+ * - by default, just set the first target (distinction here is only for multiple-targeted constraints)
*/
if (tar_pchan)
set_constraint_nth_target(con, tar_ob, tar_pchan->name, 0);
BLI_snprintf(result_str, sizeof(result_str), "Bake Failed: %s", canvas->error);
BKE_report(op->reports, RPT_ERROR, result_str);
}
- else { /* User cancelled the bake */
+ else { /* User canceled the bake */
BLI_strncpy(result_str, "Baking Cancelled!", sizeof(result_str));
BKE_report(op->reports, RPT_WARNING, result_str);
}
/* make sure it fits! */
for(sv= sc->vertbase.first; sv; sv= sv->next) {
- /* FIXME, this resizing logic is no good when resizing the window + redrawing [#24428]
+ /* FIXME, this re-sizing logic is no good when re-sizing the window + redrawing [#24428]
* need some way to store these as floats internally and re-apply from there. */
tempf= ((float)sv->vec.x)*facx;
sv->vec.x= (short)(tempf+0.5f);
/* We need to find the closest point along the face edge,
* getting the screen_px_from_*** wont work because our actual location
- * is not relevent, since we are outside the face, Use VecLerpf to find
+ * is not relevant, since we are outside the face, Use VecLerpf to find
* our location on the side of the face's UV */
#if 0
if (is_ortho) screen_px_from_ortho(ps, uv, v1co, v2co, v3co, uv1co, uv2co, uv3co, pixelScreenCo);
ps->is_ortho= project_paint_view_clip(ps->v3d, ps->rv3d, &ps->clipsta, &ps->clipend);
}
else {
- /* reprojection */
+ /* re-projection */
float winmat[4][4];
float vmat[4][4];
CLAMP(ps->screenMax[1], (float)(-diameter), (float)(ps->winy + diameter));
#endif
}
- else { /* reprojection, use bounds */
+ else { /* re-projection, use bounds */
ps->screenMin[0]= 0;
ps->screenMax[0]= (float)(ps->winx);
if(image) {
/* now for the trickyness. store the view projection here!
- * reprojection will reuse this */
+ * re-projection will reuse this */
View3D *v3d= CTX_wm_view3d(C);
RegionView3D *rv3d= CTX_wm_region_view3d(C);
float radius;
/* if the active area is being applied for symmetry, flip it
- * across the symmetry axis and rotate it back to the orignal
+ * across the symmetry axis and rotate it back to the original
* position in order to project it. This insures that the
* brush texture will be oriented correctly. */
}
/* region updates? */
- // XXX resizing y-extents of tot should go here?
+ // XXX re-sizing y-extents of tot should go here?
}
/* only called once, from space/spacetypes.c */
glVertex3f(x-tdx, y-tdy, 0);
glEnd();
- /* search resizing triangle */
+ /* search re-sizing triangle */
x= track->search_max[0];
y= track->search_min[1];
glVertex3f(x-tdx, y-tdy, 0);
glEnd();
- /* pattern resizing triangle */
+ /* pattern re-sizing triangle */
x= track->pat_max[0];
y= track->pat_min[1];
Scene *scene= CTX_data_scene(C);
MovieClip *clip= ED_space_clip(sc);
- /* if tracking is in progress, we should sunchronize framenr from clipuser
+ /* if tracking is in progress, we should synchronize framenr from clipuser
* so latest tracked frame would be shown */
if(clip && clip->tracking_context)
BKE_tracking_sync_user(&sc->user, clip->tracking_context);
WM_jobs_customdata(steve, tmj, track_markers_freejob);
/* if there's delay set in tracking job, tracking should happen
- * with fixed FPS. To deal with editor refresh we have to syncronize
+ * with fixed FPS. To deal with editor refresh we have to synchronize
* tracks from job and tracks in clip. Do this in timer callback
* to prevent threading conflicts. */
if(tmj->delay>0) WM_jobs_timer(steve, tmj->delay/1000.0f, NC_MOVIECLIP|NA_EVALUATED, 0);
if(!solved)
BKE_report(scj->reports, RPT_WARNING, "Some data failed to reconstruct, see console for details");
else
- BKE_reportf(scj->reports, RPT_INFO, "Average reprojection error %.3f", tracking->reconstruction.error);
+ BKE_reportf(scj->reports, RPT_INFO, "Average re-projection error %.3f", tracking->reconstruction.error);
/* set currently solved clip as active for scene */
if(scene->clip)
/* properties */
RNA_def_int(ot->srna, "frames", 0, 0, INT_MAX, "Tracked Frames", "Effect on tracks which are tracked less than specified amount of frames", 0, INT_MAX);
- RNA_def_float(ot->srna, "error", 0.0f, 0.0f, FLT_MAX, "Reprojection Error", "Effect on tracks with have got larger reprojection error", 0.0f, 100.0f);
+ RNA_def_float(ot->srna, "error", 0.0f, 0.0f, FLT_MAX, "Reprojection Error", "Effect on tracks with have got larger re-projection error", 0.0f, 100.0f);
RNA_def_enum(ot->srna, "action", actions_items, 0, "Action", "Cleanup action to execute");
}
wmKeyMap *keymap;
ListBase *lb;
- const float prev_y_min= ar->v2d.cur.ymin; /* so resizing keeps the cursor visible */
+ const float prev_y_min= ar->v2d.cur.ymin; /* so re-sizing keeps the cursor visible */
UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy);
}
/* region updates? */
- // XXX resizing y-extents of tot should go here?
+ // XXX re-sizing y-extents of tot should go here?
/* update the state of the animchannels in response to changes from the data they represent
* NOTE: the temp flag is used to indicate when this needs to be done, and will be cleared once handled
}
/* quick cache recalculation is also used in delete operator,
- * which could merge lines which are adjusent to current selection lines
+ * which could merge lines which are adjacent to current selection lines
* expand recalculate area to this lines */
if(drawcache->valid_head>0) drawcache->valid_head--;
if(drawcache->valid_tail>0) drawcache->valid_tail--;
scroll->ymin= 4;
scroll->ymax= 4+pix_available;
- /* when resizing a view-port with the bar at the bottom to a greater height more blank lines will be added */
+ /* when re-sizing a view-port with the bar at the bottom to a greater height more blank lines will be added */
if(ltexth + blank_lines < st->top + st->viewlines) {
blank_lines = st->top + st->viewlines - ltexth;
}
if (me->drawflag & ME_DRAWEXTRA_FACEAREA) {
/* would be nice to use BM_face_area_calc, but that is for 2d faces
- * so instead add up tessellationf triangle areas */
+ * so instead add up tessellation triangle areas */
BMFace *f;
int n;
}
if (draw_wire != OBDRAW_WIRE_OFF) {
- /* When using wireframe object traw in particle edit mode
+ /* When using wireframe object draw in particle edit mode
* the mesh gets in the way of seeing the particles, fade the wire color
* with the background. */
if (is_obact && (ob->mode & OB_MODE_PARTICLE_EDIT)) {
/* we need to correct axis length for the current zoomlevel of view,
* this to prevent projected values to be clipped behind the camera
* and to overflow the short integers.
- * The formula used is a bit stupid, just a simplification of the substraction
+ * The formula used is a bit stupid, just a simplification of the subtraction
* of two 2D points 30 pixels apart (that's the last factor in the formula) after
* projecting them with window_to_3d_delta and then get the length of that vector.
*/
{
Object *ob;
// short redrawipo=0, resetslowpar=1;
- int cancelled= (t->state == TRANS_CANCEL);
+ int canceled= (t->state == TRANS_CANCEL);
short duplicate= (t->mode == TFM_TIME_DUPLICATE);
/* early out when nothing happened */
if (t->spacetype==SPACE_VIEW3D) {
if (t->obedit) {
- if (cancelled==0) {
+ if (canceled==0) {
/* we need to delete the temporary faces before automerging */
if(t->mode == TFM_EDGE_SLIDE){
SlideData *sld = t->customData;
- /* handle multires reprojection, done
+ /* handle multires re-projection, done
* on transform completion since it's
* really slow -joeedh */
projectSVData(t, TRUE);
/* marker transform, not especially nice but we may want to move markers
* at the same time as keyframes in the dope sheet. */
- if ((sseq->flag & SEQ_MARKER_TRANS) && (cancelled == 0)) {
+ if ((sseq->flag & SEQ_MARKER_TRANS) && (canceled == 0)) {
/* cant use , TFM_TIME_EXTEND
* for some reason EXTEND is changed into TRANSLATE, so use frame_side instead */
SpaceNode *snode= (SpaceNode *)t->sa->spacedata.first;
ED_node_update_hierarchy(C, snode->edittree);
- if(cancelled == 0)
+ if(canceled == 0)
ED_node_link_insert(t->sa);
/* clear link line */
/* 3 cases here for curve cleanups:
* 1) NOTRANSKEYCULL on -> cleanup of duplicates shouldn't be done
- * 2) cancelled == 0 -> user confirmed the transform, so duplicates should be removed
- * 3) cancelled + duplicate -> user cancelled the transform, but we made duplicates, so get rid of these
+ * 2) canceled == 0 -> user confirmed the transform, so duplicates should be removed
+ * 3) canceled + duplicate -> user canceled the transform, but we made duplicates, so get rid of these
*/
if ( (saction->flag & SACTION_NOTRANSKEYCULL)==0 &&
- ((cancelled == 0) || (duplicate)) )
+ ((canceled == 0) || (duplicate)) )
{
if (adt) {
ANIM_nla_mapping_apply_fcurve(adt, fcu, 0, 1);
/* 3 cases here for curve cleanups:
* 1) NOTRANSKEYCULL on -> cleanup of duplicates shouldn't be done
- * 2) cancelled == 0 -> user confirmed the transform, so duplicates should be removed
- * 3) cancelled + duplicate -> user cancelled the transform, but we made duplicates, so get rid of these
+ * 2) canceled == 0 -> user confirmed the transform, so duplicates should be removed
+ * 3) canceled + duplicate -> user canceled the transform, but we made duplicates, so get rid of these
*/
if ( (saction->flag & SACTION_NOTRANSKEYCULL)==0 &&
- ((cancelled == 0) || (duplicate)) )
+ ((canceled == 0) || (duplicate)) )
{
posttrans_action_clean(&ac, (bAction *)ac.data);
}
/* remove duplicate frames and also make sure points are in order! */
/* 3 cases here for curve cleanups:
* 1) NOTRANSKEYCULL on -> cleanup of duplicates shouldn't be done
- * 2) cancelled == 0 -> user confirmed the transform, so duplicates should be removed
- * 3) cancelled + duplicate -> user cancelled the transform, but we made duplicates, so get rid of these
+ * 2) canceled == 0 -> user confirmed the transform, so duplicates should be removed
+ * 3) canceled + duplicate -> user canceled the transform, but we made duplicates, so get rid of these
*/
if ( (saction->flag & SACTION_NOTRANSKEYCULL)==0 &&
- ((cancelled == 0) || (duplicate)) )
+ ((canceled == 0) || (duplicate)) )
{
bGPdata *gpd;
/* marker transform, not especially nice but we may want to move markers
* at the same time as keyframes in the dope sheet.
*/
- if ((saction->flag & SACTION_MARKERS_MOVE) && (cancelled == 0)) {
+ if ((saction->flag & SACTION_MARKERS_MOVE) && (canceled == 0)) {
if (t->mode == TFM_TIME_TRANSLATE) {
#if 0
if (ELEM(t->frame_side, 'L', 'R')) { /* TFM_TIME_EXTEND */
/* 3 cases here for curve cleanups:
* 1) NOTRANSKEYCULL on -> cleanup of duplicates shouldn't be done
- * 2) cancelled == 0 -> user confirmed the transform, so duplicates should be removed
- * 3) cancelled + duplicate -> user cancelled the transform, but we made duplicates, so get rid of these
+ * 2) canceled == 0 -> user confirmed the transform, so duplicates should be removed
+ * 3) canceled + duplicate -> user canceled the transform, but we made duplicates, so get rid of these
*/
if ( (sipo->flag & SIPO_NOTRANSKEYCULL)==0 &&
- ((cancelled == 0) || (duplicate)) )
+ ((canceled == 0) || (duplicate)) )
{
if (adt) {
ANIM_nla_mapping_apply_fcurve(adt, fcu, 0, 0);
* Note: if the refresh is really needed after cancel then some way
* has to be added to not update handle types (see bug 22289).
*/
- if(!cancelled)
+ if(!canceled)
ANIM_editkeyframes_refresh(&ac);
}
else if (t->spacetype == SPACE_NLA) {
}
/* set BONE_TRANSFORM flags for autokey, manipulator draw might have changed them */
- if (!cancelled && (t->mode != TFM_DUMMY))
+ if (!canceled && (t->mode != TFM_DUMMY))
count_set_pose_transflags(&t->mode, t->around, ob);
/* if target-less IK grabbing, we calculate the pchan transforms and clear flag */
- if (!cancelled && t->mode==TFM_TRANSLATION)
+ if (!canceled && t->mode==TFM_TRANSLATION)
targetless_ik= apply_targetless_ik(ob);
else {
/* not forget to clear the auto flag */
if (t->mode==TFM_TRANSLATION)
pose_grab_with_ik_clear(ob);
- /* automatic inserting of keys and unkeyed tagging - only if transform wasn't cancelled (or TFM_DUMMY) */
- if (!cancelled && (t->mode != TFM_DUMMY)) {
+ /* automatic inserting of keys and unkeyed tagging - only if transform wasn't canceled (or TFM_DUMMY) */
+ if (!canceled && (t->mode != TFM_DUMMY)) {
autokeyframe_pose_cb_func(C, t->scene, (View3D *)t->view, ob, t->mode, targetless_ik);
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
}
DAG_id_tag_update(&ob->id, OB_RECALC_OB);
/* Set autokey if necessary */
- if (!cancelled) {
+ if (!canceled) {
autokeyframe_ob_cb_func(C, t->scene, (View3D *)t->view, ob, t->mode);
/* only calculate paths if there are paths to be recalculated */
if ((snla->flag & SNLA_NOREALTIMEUPDATES) == 0)
ANIM_id_update(t->scene, tdn->id);
- /* if cancelling transform, just write the values without validating, then move on */
+ /* if canceling transform, just write the values without validating, then move on */
if (t->state == TRANS_CANCEL) {
/* clear the values by directly overwriting the originals, but also need to restore
* endpoints of neighboring transition-strips
} CustomDataExternal;
/** structure which stores custom element data associated with mesh elements
- * (vertices, edges or faces). The custom data is organised into a series of
+ * (vertices, edges or faces). The custom data is organized into a series of
* layers, each with a data type (e.g. MTFace, MDeformVert, etc.). */
typedef struct CustomData {
CustomDataLayer *layers; /* CustomDataLayers, ordered by type */
#define NDOF_SHOULD_ZOOM (1 << 4)
#define NDOF_SHOULD_ROTATE (1 << 5)
/* orbit navigation modes
- * only two options, so it's sort of a hyrbrid bool/enum
+ * only two options, so it's sort of a hybrid bool/enum
* if ((U.ndof_flag & NDOF_ORBIT_MODE) == NDOF_OM_OBJECT)... */
/*
#define NDOF_ORBIT_MODE (1 << 6)
RNA_def_property_range(prop, 0, INT_MAX);
RNA_def_property_ui_text(prop, "Tracked Frames", "Effect on tracks which are tracked less than the specified amount of frames");
- /* reprojection error */
+ /* re-projection error */
prop = RNA_def_property(srna, "clean_error", PROP_FLOAT, PROP_NONE);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_float_sdna(prop, NULL, "clean_error");
RNA_def_property_range(prop, 0, FLT_MAX);
- RNA_def_property_ui_text(prop, "Reprojection Error", "Effect on tracks which have a larger reprojection error");
+ RNA_def_property_ui_text(prop, "Reprojection Error", "Effect on tracks which have a larger re-projection error");
/* cleanup action */
prop = RNA_def_property(srna, "clean_action", PROP_ENUM, PROP_NONE);
/* cancel */
func = RNA_def_function(srna, "cancel", NULL);
- RNA_def_function_ui_description(func, "Called when the operator is cancelled");
+ RNA_def_function_ui_description(func, "Called when the operator is canceled");
RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL);
parm = RNA_def_pointer(func, "context", "Context", "", "");
RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL);
invert_m4_m4(tmp, mmd->mirror_ob->obmat);
mult_m4_m4m4(tmp, tmp, ob->obmat);
- /* itmp is the reverse transform back to origin-relative coordiantes */
+ /* itmp is the reverse transform back to origin-relative coordinates */
invert_m4_m4(itmp, tmp);
/* combine matrices to get a single matrix that translates coordinates into
if (PySequence_Fast_GET_SIZE(value) != stop-start) {
Py_DECREF(value);
PyErr_SetString(PyExc_TypeError,
- "bpy_prop_array[slice] = value: resizing bpy_struct arrays isn't supported");
+ "bpy_prop_array[slice] = value: re-sizing bpy_struct arrays isn't supported");
return -1;
}
/* for modal temporary operators, initially invoke is called. then
* any further events are handled in modal. if the operation is
- * cancelled due to some external reason, cancel is called
+ * canceled due to some external reason, cancel is called
* - see defines below for return values */
int (*invoke)(struct bContext *, struct wmOperator *, struct wmEvent *);
int (*cancel)(struct bContext *, struct wmOperator *);
handler->op= NULL;
}
- /* remove modal handler, operator itself should have been cancelled and freed */
+ /* remove modal handler, operator itself should have been canceled and freed */
if(retval & (OPERATOR_CANCELLED|OPERATOR_FINISHED)) {
WM_cursor_ungrab(CTX_wm_window(C));
int WM_modal_tweak_exit(wmEvent *evt, int tweak_event)
{
/* if the release-confirm userpref setting is enabled,
- * tweak events can be cancelled when mouse is released
+ * tweak events can be canceled when mouse is released
*/
if (U.flag & USER_RELEASECONFIRM) {
/* option on, so can exit with km-release */
case ESCKEY:
case RIGHTMOUSE:
- /* cancelled; restore original value */
+ /* canceled; restore original value */
radial_control_set_value(rc, rc->initial_value);
ret = OPERATOR_CANCELLED;
break;
#endif
/**
- * gameengine parameters are automaticly put into system
+ * gameengine parameters are automatically put into system
* -g [paramname = value]
* -g [boolparamname]
* example:
projects / blender-staging.git / commitdiff