[Bf-blender-cvs] [fb646752094] soc-2019-openxr: Fix invalid delete operator use

[Julian Eisel]

Commit: fb64675209445363a004736b77b0ffe90943d299
Author: Julian Eisel
Date:   Wed Jun 19 19:09:40 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rBfb64675209445363a004736b77b0ffe90943d299

Fix invalid delete operator use

Again a thing MSVC should warn about but didn't...

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

M	intern/ghost/intern/GHOST_XRSession.cpp
M	intern/ghost/intern/GHOST_XR_intern.h
M	release/scripts/addons

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

diff --git a/intern/ghost/intern/GHOST_XRSession.cpp b/intern/ghost/intern/GHOST_XRSession.cpp
index 9255450e604..f0c621e6307 100644
--- a/intern/ghost/intern/GHOST_XRSession.cpp
+++ b/intern/ghost/intern/GHOST_XRSession.cpp
@@ -67,51 +67,40 @@ static void GHOST_XR_system_init(OpenXRData *oxr)
   xrGetSystem(oxr->instance, &system_info, &oxr->system_id);
 }
 
-class GHOST_XRGraphicsBinding {
- public:
-  union {
-#if defined(WITH_X11)
-    XrGraphicsBindingOpenGLXlibKHR glx;
-#elif defined(WIN32)
-    XrGraphicsBindingOpenGLWin32KHR wgl;
-    XrGraphicsBindingD3D11KHR d3d11;
-#endif
-  } oxr_binding;
-
-  void initFromGhostContext(GHOST_TGraphicsBinding type, GHOST_Context *ghost_ctx)
-  {
-    switch (type) {
-      case GHOST_kXRGraphicsOpenGL: {
+void GHOST_XRGraphicsBinding::initFromGhostContext(GHOST_TGraphicsBinding type,
+                                                   GHOST_Context *ghost_ctx)
+{
+  switch (type) {
+    case GHOST_kXRGraphicsOpenGL: {
 #if defined(WITH_X11)
-        GHOST_ContextGLX *ctx_glx = static_cast<GHOST_ContextGLX *>(ghost_ctx);
+      GHOST_ContextGLX *ctx_glx = static_cast<GHOST_ContextGLX *>(ghost_ctx);
 
-        oxr_binding.glx.type = XR_TYPE_GRAPHICS_BINDING_OPENGL_XLIB_KHR;
-        oxr_binding.glx.xDisplay = ctx_glx->m_display;
+      oxr_binding.glx.type = XR_TYPE_GRAPHICS_BINDING_OPENGL_XLIB_KHR;
+      oxr_binding.glx.xDisplay = ctx_glx->m_display;
 #elif defined(WIN32)
-        GHOST_ContextWGL *ctx_wgl = static_cast<GHOST_ContextWGL *>(ghost_ctx);
+      GHOST_ContextWGL *ctx_wgl = static_cast<GHOST_ContextWGL *>(ghost_ctx);
 
-        oxr_binding.wgl.type = XR_TYPE_GRAPHICS_BINDING_OPENGL_WIN32_KHR;
-        oxr_binding.wgl.hDC = ctx_wgl->m_hDC;
-        oxr_binding.wgl.hGLRC = ctx_wgl->m_hGLRC;
+      oxr_binding.wgl.type = XR_TYPE_GRAPHICS_BINDING_OPENGL_WIN32_KHR;
+      oxr_binding.wgl.hDC = ctx_wgl->m_hDC;
+      oxr_binding.wgl.hGLRC = ctx_wgl->m_hGLRC;
 #endif
 
-        break;
-      }
+      break;
+    }
 #ifdef WIN32
-      case GHOST_kXRGraphicsD3D11: {
-        GHOST_ContextD3D *ctx_d3d = static_cast<GHOST_ContextD3D *>(ghost_ctx);
+    case GHOST_kXRGraphicsD3D11: {
+      GHOST_ContextD3D *ctx_d3d = static_cast<GHOST_ContextD3D *>(ghost_ctx);
 
-        oxr_binding.d3d11.type = XR_TYPE_GRAPHICS_BINDING_D3D11_KHR;
-        oxr_binding.d3d11.device = ctx_d3d->m_device.Get();
+      oxr_binding.d3d11.type = XR_TYPE_GRAPHICS_BINDING_D3D11_KHR;
+      oxr_binding.d3d11.device = ctx_d3d->m_device.Get();
 
-        break;
-      }
-#endif
-      default:
-        assert(false);
+      break;
     }
+#endif
+    default:
+      assert(false);
   }
-};
+}
 
 void GHOST_XR_session_start(GHOST_XRContext *xr_context)
 {
diff --git a/intern/ghost/intern/GHOST_XR_intern.h b/intern/ghost/intern/GHOST_XR_intern.h
index 12162d59939..da0cad54712 100644
--- a/intern/ghost/intern/GHOST_XR_intern.h
+++ b/intern/ghost/intern/GHOST_XR_intern.h
@@ -36,6 +36,20 @@ typedef struct OpenXRData {
   XrSessionState session_state;
 } OpenXRData;
 
+class GHOST_XRGraphicsBinding {
+ public:
+  union {
+#if defined(WITH_X11)
+    XrGraphicsBindingOpenGLXlibKHR glx;
+#elif defined(WIN32)
+    XrGraphicsBindingOpenGLWin32KHR wgl;
+    XrGraphicsBindingD3D11KHR d3d11;
+#endif
+  } oxr_binding;
+
+  void initFromGhostContext(GHOST_TGraphicsBinding type, class GHOST_Context *ghost_ctx);
+};
+
 typedef struct GHOST_XRContext {
   OpenXRData oxr;
 
diff --git a/release/scripts/addons b/release/scripts/addons
index a5a236df5f6..b154bd63c0f 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit a5a236df5f6630ea17958e3006070ef609c6a4b8
+Subproject commit b154bd63c0fd87bbb4679c2635f3fc5701f86ae0