bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

3D View: any view axis also showing grid

Browse Source 
Setting accidentally impacted in ortho view.
This commit is contained in:
Campbell Barton 2018-07-11 11:59:11 +02:00
parent 11cd9b0541
commit ff39cbdc86
1 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/draw/modes/object_mode.c
View File

@ -468,35 +468,56 @@ static void OBJECT_engine_init(void *vedata)
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;
}
if (show_axis_z) {
e_data.grid_flag |= SHOW_AXIS_Z;
}
if (show_floor) {
e_data.grid_flag |= SHOW_GRID;
e_data.grid_flag |= 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;
}
}
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;
}
if (show_axis_z) {
e_data.grid_flag |= SHOW_AXIS_Z;
}
if (show_floor) {
e_data.grid_flag |= SHOW_GRID;
e_data.grid_flag |= GRID_BACK;
}
}
else { /* RV3D_VIEW_USER */
e_data.grid_flag = PLANE_XY;
if (show_axis_x)
if (show_axis_x) {
e_data.grid_flag |= SHOW_AXIS_X;
if (show_axis_y)
}
if (show_axis_y) {
e_data.grid_flag |= SHOW_AXIS_Y;
if (show_floor)
}
if (show_floor) {
e_data.grid_flag |= SHOW_GRID;
}
}
}
e_data.grid_normal[0] = (float)((e_data.grid_flag & PLANE_YZ) != 0);
e_data.grid_normal[1] = (float)((e_data.grid_flag & PLANE_XZ) != 0);