[Bf-blender-cvs] [a05104d61f8] soc-2019-openxr: Fix warnings and compile error on GCC

[Julian Eisel]

Commit: a05104d61f8a9678c45e87c1c6e6649875ddbaf6
Author: Julian Eisel
Date:   Tue Jul 9 11:28:17 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rBa05104d61f8a9678c45e87c1c6e6649875ddbaf6

Fix warnings and compile error on GCC

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

M	intern/ghost/intern/GHOST_XrSession.cpp
M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/windowmanager/intern/wm_operators.c
M	source/blender/windowmanager/intern/wm_xr.c
M	source/blender/windowmanager/wm.h
M	source/tools

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

diff --git a/intern/ghost/intern/GHOST_XrSession.cpp b/intern/ghost/intern/GHOST_XrSession.cpp
index 930edb4e190..2e866635567 100644
--- a/intern/ghost/intern/GHOST_XrSession.cpp
+++ b/intern/ghost/intern/GHOST_XrSession.cpp
@@ -215,6 +215,8 @@ static void create_reference_space(OpenXRSessionData *oxr, const GHOST_XrPose *b
   create_info.poseInReferenceSpace.orientation.y = base_pose->orientation_quat[3];
   create_info.poseInReferenceSpace.orientation.z = -base_pose->orientation_quat[2];
   create_info.poseInReferenceSpace.orientation.w = base_pose->orientation_quat[0];
+#else
+  (void)base_pose;
 #endif
 
   xrCreateReferenceSpace(oxr->session, &create_info, &oxr->reference_space);
diff --git a/release/datafiles/locale b/release/datafiles/locale
index d1f85e37b7f..0f771b0f380 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit d1f85e37b7fa2574243a112670fd36fbebc61d4c
+Subproject commit 0f771b0f380a1ae21d859416043c6119f66e40c9
diff --git a/release/scripts/addons b/release/scripts/addons
index 0e53a9a3867..aa3366b7805 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 0e53a9a38672790d5fbb9a1d4a935980824d4a84
+Subproject commit aa3366b7805bbe4d1afee890bda81b6d91bd47be
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index e83541d42c7..0aa23a4d617 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit e83541d42c71bfb689acf9a53a6eb66b0c190451
+Subproject commit 0aa23a4d6177bed4c12392c81d0b767a8b35fe61
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index cba19806dcc..caf11cd7be9 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -111,7 +111,6 @@
 #include "wm_event_system.h"
 #include "wm_event_types.h"
 #include "wm_files.h"
-#include "wm_surface.h"
 #include "wm_window.h"
 
 #define UNDOCUMENTED_OPERATOR_TIP N_("(undocumented operator)")
diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c
index b90517d560b..72427442816 100644
--- a/source/blender/windowmanager/intern/wm_xr.c
+++ b/source/blender/windowmanager/intern/wm_xr.c
@@ -234,8 +234,6 @@ static GHOST_ContextHandle wm_xr_draw_view(const GHOST_XrDrawViewInfo *draw_view
   GPU_framebuffer_restore();
   DRW_opengl_context_disable_ex(true);
 
-  void wm_draw_offscreen_texture_parameters(GPUOffScreen * offscreen);
-  void wm_draw_upside_down(int sizex, int sizey);
   GPUTexture *texture = GPU_offscreen_color_texture(offscreen);
   rcti rect = {.xmin = 0, .ymin = 0, .xmax = draw_view->width - 1, .ymax = draw_view->height - 1};
 
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index 551eb274799..291023f85cb 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -95,6 +95,11 @@ void wm_stereo3d_set_cancel(bContext *C, wmOperator *op);
 void wm_open_init_load_ui(wmOperator *op, bool use_prefs);
 void wm_open_init_use_scripts(wmOperator *op, bool use_prefs);
 
+/* wm_draw.c */
+struct GPUOffScreen;
+void wm_draw_offscreen_texture_parameters(struct GPUOffScreen *offscreen);
+void wm_draw_upside_down(int sizex, int sizey);
+
 #ifdef WITH_OPENXR
 /* wm_xr.c */
 bool wm_xr_context_ensure(wmWindowManager *wm);
diff --git a/source/tools b/source/tools
index eb406b701d5..aa9cc18913a 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit eb406b701d5a251818e425fec489417477019d61
+Subproject commit aa9cc18913aca559e932d5b7894e3c222ccffae4