diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-02 10:33:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-02 10:33:07 +0300 |
| commit | 3788f58e74f51db4f5f9200f9ff698ed35227753 (patch) | |
| tree | 11f40abde8fbbe533bc368dbdb71a923c1bc24f6 | |
| parent | a76b045326d69287585b914329339ae8390783f5 (diff) | |
3D View: use grid & all axes in axis-views
Matches 2.7x behavior.
| -rw-r--r-- | source/blender/draw/modes/object_mode.c | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 4ecd1175c7c..4fe103ceb1f 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -526,43 +526,13 @@ static void OBJECT_engine_init(void *vedata) grid_res = viewdist / grid_scale; if (ELEM(rv3d->view, RV3D_VIEW_RIGHT, RV3D_VIEW_LEFT)) { - e_data.grid_flag = PLANE_YZ; - if (show_axis_y) { - e_data.grid_flag |= SHOW_AXIS_Y; - } - { - e_data.grid_flag |= SHOW_AXIS_Z; - } - if (show_floor) { - e_data.grid_flag |= SHOW_GRID; - e_data.grid_flag |= GRID_BACK; - } + e_data.grid_flag = PLANE_YZ | SHOW_AXIS_Y | SHOW_AXIS_Z | SHOW_GRID | GRID_BACK; } else if (ELEM(rv3d->view, RV3D_VIEW_TOP, RV3D_VIEW_BOTTOM)) { - e_data.grid_flag = PLANE_XY; - if (show_axis_x) { - e_data.grid_flag |= SHOW_AXIS_X; - } - if (show_axis_y) { - e_data.grid_flag |= SHOW_AXIS_Y; - } - if (show_floor) { - e_data.grid_flag |= SHOW_GRID; - e_data.grid_flag |= GRID_BACK; - } + e_data.grid_flag = PLANE_XY | SHOW_AXIS_X | SHOW_AXIS_Y | SHOW_GRID | GRID_BACK; } else if (ELEM(rv3d->view, RV3D_VIEW_FRONT, RV3D_VIEW_BACK)) { - e_data.grid_flag = PLANE_XZ; - if (show_axis_x) { - e_data.grid_flag |= SHOW_AXIS_X; - } - { - e_data.grid_flag |= SHOW_AXIS_Z; - } - if (show_floor) { - e_data.grid_flag |= SHOW_GRID; - e_data.grid_flag |= GRID_BACK; - } + e_data.grid_flag = PLANE_XZ | SHOW_AXIS_X | SHOW_AXIS_Z | SHOW_GRID | GRID_BACK; } else { /* RV3D_VIEW_USER */ e_data.grid_flag = PLANE_XY; |