[Bf-blender-cvs] [7fe1cc8d245] soc-2019-openxr: Enable grid floor in VR session

[Julian Eisel]

Commit: 7fe1cc8d245e4efac2bc902b1001a8e79b20bbf7
Author: Julian Eisel
Date:   Tue Jul 9 10:56:37 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rB7fe1cc8d245e4efac2bc902b1001a8e79b20bbf7

Enable grid floor in VR session

Helps quite a bit orientating.

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/editors/space_view3d/view3d_draw.c
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 6a6b84fd505..d1f85e37b7f 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 6a6b84fd50538a65276c729b5d396be615bc79f2
+Subproject commit d1f85e37b7fa2574243a112670fd36fbebc61d4c
diff --git a/release/scripts/addons b/release/scripts/addons
index 5819abebf40..0e53a9a3867 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 5819abebf40d5f09543bfe2af3aa4dfa698b3114
+Subproject commit 0e53a9a38672790d5fbb9a1d4a935980824d4a84
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index f00d4fbe848..e83541d42c7 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit f00d4fbe84852e40af281267c06dc21bafb5df49
+Subproject commit e83541d42c71bfb689acf9a53a6eb66b0c190451
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 65917943fc5..48b5c1513c6 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1635,13 +1635,22 @@ void ED_view3d_draw_offscreen_simple(Depsgraph *depsgraph,
     v3d.shading.flag = V3D_SHADING_SCENE_WORLD | V3D_SHADING_SCENE_LIGHTS;
   }
 
-  v3d.flag2 = V3D_HIDE_OVERLAYS;
-
   if (draw_flags & V3D_OFSDRAW_SHOW_ANNOTATION) {
     v3d.flag2 |= V3D_SHOW_ANNOTATION;
   }
   if (draw_flags & V3D_OFSDRAW_SHOW_GRIDFLOOR) {
     v3d.gridflag |= V3D_SHOW_FLOOR | V3D_SHOW_X | V3D_SHOW_Y;
+    v3d.grid = 1.0f;
+    v3d.gridlines = 16;
+    v3d.gridsubdiv = 10;
+
+    /* Show grid, disable other overlays (set all available _HIDE_ flags). */
+    v3d.overlay.flag |= V3D_OVERLAY_HIDE_CURSOR | V3D_OVERLAY_HIDE_TEXT |
+                        V3D_OVERLAY_HIDE_MOTION_PATHS | V3D_OVERLAY_HIDE_BONES |
+                        V3D_OVERLAY_HIDE_OBJECT_XTRAS | V3D_OVERLAY_HIDE_OBJECT_ORIGINS;
+  }
+  else {
+    v3d.flag2 = V3D_HIDE_OVERLAYS;
   }
 
   v3d.shading.background_type = V3D_SHADING_BACKGROUND_WORLD;
diff --git a/source/tools b/source/tools
index 8598818108d..eb406b701d5 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 8598818108ddaf35e30d2a2dbd408ad371e41eb5
+Subproject commit eb406b701d5a251818e425fec489417477019d61