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/transform/transform_gizmo_3d.c | |
| parent | 0f6b2504f80edddc76c104e9df0722fbb7d484a7 (diff) | |
| parent | a247b53084760498ca81eb6bdb901dee8f3a02ca (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/transform/transform_gizmo_3d.c')
| -rw-r--r-- | source/blender/editors/transform/transform_gizmo_3d.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index 0f3f335248a..9a2c69d5a46 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -659,7 +659,7 @@ void ED_transform_calc_orientation_from_type_ex( if (ob->mode & OB_MODE_POSE) { /* each bone moves on its own local axis, but to avoid confusion, * use the active pones axis for display [#33575], this works as expected on a single bone - * and users who select many bones will understand whats going on and what local means + * and users who select many bones will understand what's going on and what local means * when they start transforming */ ED_getTransformOrientationMatrix(C, r_mat, pivot_point); ok = true; @@ -816,7 +816,7 @@ int ED_transform_calc_gizmo_stats( BMEditSelection ese; float vec[3] = {0, 0, 0}; - /* USE LAST SELECTE WITH ACTIVE */ + /* USE LAST SELECT WITH ACTIVE */ if ((pivot_point == V3D_AROUND_ACTIVE) && BM_select_history_active_get(em->bm, &ese)) { BM_editselection_center(&ese, vec); calc_tw_center(tbounds, vec); |