[Bf-blender-cvs] [2be29999bd4] master: Fix T61701: Orthographic Viewpoints Hidden Grid

Sebastian Parborg noreply at git.blender.org
Tue Feb 19 18:53:24 CET 2019


Commit: 2be29999bd4174b99afc634bb3262decccd5278d
Author: Sebastian Parborg
Date:   Tue Feb 19 18:51:57 2019 +0100
Branches: master
https://developer.blender.org/rB2be29999bd4174b99afc634bb3262decccd5278d

Fix T61701: Orthographic Viewpoints Hidden Grid

If all axis and grid options were turned off, the grid in the main ortho views would not be rendered.
Now we force rendering of the grid regardless of the settings when in one of the main ortho views.

Reviewed By: Brecht Van Lommel

Differential Revision: https://developer.blender.org/D4378

===================================================================

M	source/blender/draw/modes/object_mode.c

===================================================================

diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 05f44a0f2f9..a20aaf43094 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -549,12 +549,15 @@ static void OBJECT_engine_init(void *vedata)
 			grid_res = viewdist / grid_scale;
 
 			if (ELEM(rv3d->view, RV3D_VIEW_RIGHT, RV3D_VIEW_LEFT)) {
+				e_data.draw_grid = true;
 				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.draw_grid = true;
 				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.draw_grid = true;
 				e_data.grid_flag = PLANE_XZ | SHOW_AXIS_X | SHOW_AXIS_Z | SHOW_GRID | GRID_BACK;
 			}
 			else { /* RV3D_VIEW_USER */



More information about the Bf-blender-cvs mailing list