[Bf-blender-cvs] [c9f6c1a0546] soc-2019-openxr: Fix wrong return value causing OpenXR initialization to fail

Julian Eisel noreply at git.blender.org
Thu Jul 11 00:51:43 CEST 2019


Commit: c9f6c1a054624502edb2b83c774522dec8a33043
Author: Julian Eisel
Date:   Thu Jul 11 00:51:00 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rBc9f6c1a054624502edb2b83c774522dec8a33043

Fix wrong return value causing OpenXR initialization to fail

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

M	intern/ghost/intern/GHOST_XrContext.cpp
M	release/datafiles/locale
M	release/scripts/addons

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

diff --git a/intern/ghost/intern/GHOST_XrContext.cpp b/intern/ghost/intern/GHOST_XrContext.cpp
index e081560f64a..bf08adcd25d 100644
--- a/intern/ghost/intern/GHOST_XrContext.cpp
+++ b/intern/ghost/intern/GHOST_XrContext.cpp
@@ -167,7 +167,7 @@ GHOST_TSuccess GHOST_XrContext::enumerateApiLayers()
 
   if (layer_count == 0) {
     /* Layers are optional, can safely exit. */
-    return GHOST_kFailure;
+    return GHOST_kSuccess;
   }
 
   m_oxr->layers = std::vector<XrApiLayerProperties>(layer_count);
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 0f771b0f380..38e501b4d7a 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 0f771b0f380a1ae21d859416043c6119f66e40c9
+Subproject commit 38e501b4d7a37d2db0f48d47bdb07c57f3fb9a0d
diff --git a/release/scripts/addons b/release/scripts/addons
index aa3366b7805..f54338c63ba 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit aa3366b7805bbe4d1afee890bda81b6d91bd47be
+Subproject commit f54338c63ba36cbbe83161c0b3d4d2b1aa01c4a9



More information about the Bf-blender-cvs mailing list