blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Campbell Barton 2020-05-15 12:52:31 +10:00
parent c880e54a95 4ce1829289
commit 191c562f98
Notes: blender-bot 2023-02-13 22:41:05 +01:00 
Referenced by issue #76277, Enabling Viewer Border in Compositor Crashes Blender
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/draw/engines/overlay/overlay_grid.c
View File

@ -63,7 +63,8 @@ void OVERLAY_grid_init(OVERLAY_Data *vedata)
shd->zneg_flag = 0;
shd->zpos_flag = 0;
if (pd->hide_overlays || !pd->v3d_gridflag) {
if (pd->hide_overlays || !(pd->v3d_gridflag & (V3D_SHOW_X | V3D_SHOW_Y | V3D_SHOW_Z |
V3D_SHOW_FLOOR | V3D_SHOW_ORTHO_GRID))) {
return;
}

2
source/blender/makesdna/DNA_view3d_types.h
View File

@ -550,7 +550,7 @@ enum {
V3D_AROUND_ACTIVE = 4,
};
/** #View3d.gridflag */
/** #View3D.gridflag */
#define V3D_SHOW_FLOOR (1 << 0)
#define V3D_SHOW_X (1 << 1)
#define V3D_SHOW_Y (1 << 2)