[Bf-blender-cvs] [b4b294693aa] refactor-mesh-sharp-face-generic: Merge branch 'master' into refactor-mesh-sharp-face-generic

[Hans Goudey]

Commit: b4b294693aa27caf71fc5194091419c430810ce5
Author: Hans Goudey
Date:   Mon Jan 9 16:10:31 2023 -0500
Branches: refactor-mesh-sharp-face-generic
https://developer.blender.org/rBb4b294693aa27caf71fc5194091419c430810ce5

Merge branch 'master' into refactor-mesh-sharp-face-generic

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



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

diff --cc source/blender/io/wavefront_obj/exporter/obj_export_mesh.hh
index 73377cda4bd,6ee2a3fccd8..6c743c15148
--- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.hh
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.hh
@@@ -8,10 -8,9 +8,10 @@@
  
  #include <optional>
  
- #include "BLI_math_vec_types.hh"
+ #include "BLI_math_vector_types.hh"
  #include "BLI_utility_mixins.hh"
  #include "BLI_vector.hh"
 +#include "BLI_virtual_array.hh"
  
  #include "DNA_material_types.h"
  #include "DNA_mesh_types.h"