diff options
Diffstat (limited to 'source/blender/editors/armature')
-rw-r--r-- | source/blender/editors/armature/editarmature.c | 6 | ||||
-rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 2 | ||||
-rw-r--r-- | source/blender/editors/armature/poseSlide.c | 8 | ||||
-rw-r--r-- | source/blender/editors/armature/poselib.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 365eb28278d..3c5de538fdc 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -3811,7 +3811,7 @@ static int armature_parent_set_exec(bContext *C, wmOperator *op) * - 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 */ @@ -4158,7 +4158,7 @@ static void bone_align_to_bone(ListBase *edbo, EditBone *selbone, EditBone *actb /* 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; } @@ -4207,7 +4207,7 @@ static int armature_align_bones_exec(bContext *C, wmOperator *op) * - 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 */ diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 74c44ea1f0d..eb707119263 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -832,7 +832,7 @@ void heat_bone_weighting(Object *ob, Mesh *me, float (*verts)[3], int numsource, /* 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; diff --git a/source/blender/editors/armature/poseSlide.c b/source/blender/editors/armature/poseSlide.c index f160e74ea03..adabf7405d6 100644 --- a/source/blender/editors/armature/poseSlide.c +++ b/source/blender/editors/armature/poseSlide.c @@ -239,7 +239,7 @@ static void pose_slide_apply_val (tPoseSlideOp *pso, FCurve *fcu, float *val) 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... */ @@ -253,7 +253,7 @@ static void pose_slide_apply_val (tPoseSlideOp *pso, FCurve *fcu, float *val) 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... */ @@ -660,14 +660,14 @@ static int pose_slide_modal (bContext *C, wmOperator *op, wmEvent *evt) /* 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); diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c index cd3017c0e0f..ef01b895f38 100644 --- a/source/blender/editors/armature/poselib.c +++ b/source/blender/editors/armature/poselib.c @@ -1473,7 +1473,7 @@ static void poselib_preview_cleanup (bContext *C, wmOperator *op) /* 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); |