[Bf-blender-cvs] [e8dfe91767b] master: Merge branch 'blender-v2.90-release'

[Julian Eisel]

Commit: e8dfe91767bd87c0499de1edbc721ef928e893d7
Author: Julian Eisel
Date:   Fri Aug 14 17:18:09 2020 +0200
Branches: master
https://developer.blender.org/rBe8dfe91767bd87c0499de1edbc721ef928e893d7

Merge branch 'blender-v2.90-release'

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



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

diff --cc intern/ghost/intern/GHOST_XrContext.cpp
index 6ccddeff5a6,3dbf539f0c7..c5fe3c3c113
--- a/intern/ghost/intern/GHOST_XrContext.cpp
+++ b/intern/ghost/intern/GHOST_XrContext.cpp
@@@ -347,8 -348,8 +348,9 @@@ static bool openxr_layer_is_available(c
    return false;
  }
  
 -static bool openxr_extension_is_available(const std::vector<XrExtensionProperties> extensions_info,
 -                                          const std::string_view &extension_name)
 +static bool openxr_extension_is_available(
-     const std::vector<XrExtensionProperties> &extensions_info, const std::string &extension_name)
++    const std::vector<XrExtensionProperties> &extensions_info,
++    const std::string_view &extension_name)
  {
    for (const XrExtensionProperties &ext_info : extensions_info) {
      if (ext_info.extensionName == extension_name) {