diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 16:49:59 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 16:49:59 +0300 |
commit | 58adc586612e695d04033f2029362f279a9c05a4 (patch) | |
tree | 0ebe8d1958f179e54a07eb44456002d46816a593 /source/blender/editors/armature/armature_edit.c | |
parent | 0f6b2504f80edddc76c104e9df0722fbb7d484a7 (diff) | |
parent | a247b53084760498ca81eb6bdb901dee8f3a02ca (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/armature/armature_edit.c')
-rw-r--r-- | source/blender/editors/armature/armature_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c index ccc1eefd9dc..2550e1ff85e 100644 --- a/source/blender/editors/armature/armature_edit.c +++ b/source/blender/editors/armature/armature_edit.c @@ -243,7 +243,7 @@ float ED_armature_ebone_roll_to_vector(const EditBone *bone, const float align_a return roll; } -/* note, ranges arithmatic is used below */ +/* note, ranges arithmetic is used below */ typedef enum eCalcRollTypes { /* pos */ CALC_ROLL_POS_X = 0, @@ -969,7 +969,7 @@ static int armature_merge_exec(bContext *C, wmOperator *op) bstart = ebo; } else { - /* chain is broken... merge any continous segments then clear */ + /* chain is broken... merge any continuous segments then clear */ if (bstart && bend) bones_merge(obedit, bstart, bend, bchild, &chains); |