Merge branch 'blender-v2.90-release'

2 files changed, 7 insertions, 6 deletions

diff --git a/intern/cycles/render/mesh_volume.cpp b/intern/cycles/render/mesh_volume.cpp
index 0b57243fec1..2ee51f4b732 100644
--- a/intern/cycles/render/mesh_volume.cpp
+++ b/intern/cycles/render/mesh_volume.cpp
@@ -555,6 +555,7 @@ void GeometryManager::create_volume_mesh(Mesh *mesh, Progress &progress)
   mesh->clear(true);
   mesh->reserve_mesh(vertices.size(), indices.size() / 3);
   mesh->used_shaders.push_back(volume_shader);
+  mesh->need_update_rebuild = true;
 
   for (size_t i = 0; i < vertices.size(); ++i) {
     mesh->add_vertex(vertices[i]);
diff --git a/intern/ghost/intern/GHOST_XrContext.cpp b/intern/ghost/intern/GHOST_XrContext.cpp
index 6ccddeff5a6..c5fe3c3c113 100644
--- a/intern/ghost/intern/GHOST_XrContext.cpp
+++ b/intern/ghost/intern/GHOST_XrContext.cpp
@@ -23,6 +23,7 @@
 #include <cassert>
 #include <sstream>
 #include <string>
+#include <string_view>
 
 #include "GHOST_Types.h"
 #include "GHOST_XrException.h"
@@ -348,7 +349,8 @@ static bool openxr_layer_is_available(const std::vector<XrApiLayerProperties> &l
 }
 
 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) {
@@ -405,14 +407,12 @@ void GHOST_XrContext::getExtensionsToEnable(
     const std::vector<GHOST_TXrGraphicsBinding> &graphics_binding_types,
     std::vector<const char *> &r_ext_names)
 {
-  std::vector<std::string> try_ext;
+  std::vector<std::string_view> try_ext;
 
   /* Try enabling debug extension. */
-#ifndef WIN32
   if (isDebugMode()) {
     try_ext.push_back(XR_EXT_DEBUG_UTILS_EXTENSION_NAME);
   }
-#endif
 
   r_ext_names.reserve(try_ext.size() + graphics_binding_types.size());
 
@@ -424,9 +424,9 @@ void GHOST_XrContext::getExtensionsToEnable(
     r_ext_names.push_back(gpu_binding);
   }
 
-  for (const std::string &ext : try_ext) {
+  for (const std::string_view &ext : try_ext) {
     if (openxr_extension_is_available(m_oxr->extensions, ext)) {
-      r_ext_names.push_back(ext.c_str());
+      r_ext_names.push_back(ext.data());
     }
   }
 }