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/gizmo_library | |
parent | 0f6b2504f80edddc76c104e9df0722fbb7d484a7 (diff) | |
parent | a247b53084760498ca81eb6bdb901dee8f3a02ca (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/gizmo_library')
-rw-r--r-- | source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c | 2 | ||||
-rw-r--r-- | source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c index 1cff5b82484..0646d689812 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c @@ -852,7 +852,7 @@ static int gizmo_cage2d_modal( if (event->type != MOUSEMOVE) { return OPERATOR_RUNNING_MODAL; } - /* For transform logic to be managable we operate in -0.5..0.5 2D space, + /* For transform logic to be manageable we operate in -0.5..0.5 2D space, * no matter the size of the rectangle, mouse coorts are scaled to unit space. * The mouse coords have been projected into the matrix so we don't need to worry about axis alignment. * diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c index 3b74311b800..3bbe13362d0 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c @@ -480,7 +480,7 @@ static int gizmo_cage3d_modal( if (event->type != MOUSEMOVE) { return OPERATOR_RUNNING_MODAL; } - /* For transform logic to be managable we operate in -0.5..0.5 2D space, + /* For transform logic to be manageable we operate in -0.5..0.5 2D space, * no matter the size of the rectangle, mouse coorts are scaled to unit space. * The mouse coords have been projected into the matrix so we don't need to worry about axis alignment. * |