[Bf-blender-cvs] [44f8bfdeacf] refactor-mesh-uv-map-generic: Merge branch 'master' into refactor-mesh-uv-map-generic

[Martijn Versteegh]

Commit: 44f8bfdeacfe7adc7d43040525ea3f09dd660b7d
Author: Martijn Versteegh
Date:   Wed Nov 16 12:30:18 2022 +0100
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rB44f8bfdeacfe7adc7d43040525ea3f09dd660b7d

Merge branch 'master' into refactor-mesh-uv-map-generic

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



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

diff --cc release/scripts/addons
index 68419fb3659,5a818af9508..63e1e6227af
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 68419fb3659f09e8447d351a25b1bd8e56211a5a
 -Subproject commit 5a818af95080cccf04dfa8317f0e966bff515c64
++Subproject commit 63e1e6227af42c1090fadc116e19b604d734a56c
diff --cc source/blender/bmesh/intern/bmesh_query_uv.h
index 1bd3ce6ebc7,edb756875f3..422e858f1b7
--- a/source/blender/bmesh/intern/bmesh_query_uv.h
+++ b/source/blender/bmesh/intern/bmesh_query_uv.h
@@@ -6,11 -6,10 +6,15 @@@
   * \ingroup bmesh
   */
  
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
 +/**
 + * Retrieve the custom data offsets for layers used for user interaction with the active UV map.
 + */
 +BMUVOffsets BM_uv_map_get_offsets(const BMesh *bm);
 +
  float BM_loop_uv_calc_edge_length_squared(const BMLoop *l,
                                            int cd_loop_uv_offset) ATTR_WARN_UNUSED_RESULT
      ATTR_NONNULL();