griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: quiet GCC warnings mixing enum/non-enum types

Browse Source
This commit is contained in:
Campbell Barton
2025-05-11 17:12:23 +10:00
parent 5e75a9c1e8
commit e51b4d5aa7
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/draw/engines/overlay/overlay_grid.hh
View File

@@ -233,13 +233,16 @@ class Grid : Overlay {
}
else {
if (ELEM(rv3d->view, RV3D_VIEW_RIGHT, RV3D_VIEW_LEFT)) {
grid_flag_ = PLANE_YZ | (show_axis_y ? SHOW_AXIS_Y : 0) | (show_axis_z ? SHOW_AXIS_Z : 0);
grid_flag_ = PLANE_YZ | (show_axis_y ? SHOW_AXIS_Y : OVERLAY_GridBits(0)) |
(show_axis_z ? SHOW_AXIS_Z : OVERLAY_GridBits(0));
}
else if (ELEM(rv3d->view, RV3D_VIEW_TOP, RV3D_VIEW_BOTTOM)) {
grid_flag_ = PLANE_XY | (show_axis_x ? SHOW_AXIS_X : 0) | (show_axis_y ? SHOW_AXIS_Y : 0);
grid_flag_ = PLANE_XY | (show_axis_x ? SHOW_AXIS_X : OVERLAY_GridBits(0)) |
(show_axis_y ? SHOW_AXIS_Y : OVERLAY_GridBits(0));
}
else if (ELEM(rv3d->view, RV3D_VIEW_FRONT, RV3D_VIEW_BACK)) {
grid_flag_ = PLANE_XZ | (show_axis_x ? SHOW_AXIS_X : 0) | (show_axis_z ? SHOW_AXIS_Z : 0);
grid_flag_ = PLANE_XZ | (show_axis_x ? SHOW_AXIS_X : OVERLAY_GridBits(0)) |
(show_axis_z ? SHOW_AXIS_Z : OVERLAY_GridBits(0));
}
if (show_ortho_grid) {
grid_flag_ |= SHOW_GRID | GRID_BACK;