[Bf-blender-cvs] [8a28d9129a9] refactor-mesh-uv-map-generic: Use the proper types for various CustomData layers.

[Martijn Versteegh]

Commit: 8a28d9129a9c905c43a8cde3aeeb2d10395dcac4
Author: Martijn Versteegh
Date:   Tue Nov 8 14:07:27 2022 +0100
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rB8a28d9129a9c905c43a8cde3aeeb2d10395dcac4

Use the proper types for various CustomData layers.

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

M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/bmesh/intern/bmesh_interp.c
M	source/blender/python/bmesh/bmesh_py_types_customdata.c
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 7be7aff5a18..fe221a8bc93 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 7be7aff5a18c550465b3f7634539ed4168af7c51
+Subproject commit fe221a8bc934385d9f302c46a5c7cbeacddafe3b
diff --git a/release/scripts/addons b/release/scripts/addons
index eb09be71a96..85c414a2023 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit eb09be71a96c4fe910fdc43373be5ec08b419d2c
+Subproject commit 85c414a2023c1fdf16b6f3c9dc462fe242a625b9
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c
index 0c13e6d892b..0198cb6818f 100644
--- a/source/blender/bmesh/intern/bmesh_interp.c
+++ b/source/blender/bmesh/intern/bmesh_interp.c
@@ -885,21 +885,21 @@ void BM_uv_map_ensure_vert_selection_attribute(BMesh *bm, const char *uv_map_nam
 {
   char name[MAX_CUSTOMDATA_LAYER_NAME];
   BM_data_layer_ensure_named(
-      bm, &bm->ldata, CD_PROP_FLOAT2, get_uv_map_vert_selection_name(uv_map_name, name));
+      bm, &bm->ldata, CD_PROP_BOOL, get_uv_map_vert_selection_name(uv_map_name, name));
 }
 
 void BM_uv_map_ensure_edge_selection_attribute(BMesh *bm, const char *uv_map_name)
 {
   char name[MAX_CUSTOMDATA_LAYER_NAME];
   BM_data_layer_ensure_named(
-      bm, &bm->ldata, CD_PROP_FLOAT2, get_uv_map_edge_selection_name(uv_map_name, name));
+      bm, &bm->ldata, CD_PROP_BOOL, get_uv_map_edge_selection_name(uv_map_name, name));
 }
 
 void BM_uv_map_ensure_pin_attribute(BMesh *bm, const char *uv_map_name)
 {
   char name[MAX_CUSTOMDATA_LAYER_NAME];
   BM_data_layer_ensure_named(
-      bm, &bm->ldata, CD_PROP_FLOAT2, get_uv_map_pin_name(uv_map_name, name));
+      bm, &bm->ldata, CD_PROP_BOOL, get_uv_map_pin_name(uv_map_name, name));
 }
 
 void BM_data_layer_free(BMesh *bm, CustomData *data, int type)
diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.c b/source/blender/python/bmesh/bmesh_py_types_customdata.c
index ea588a58f3d..b1e83ac7b2c 100644
--- a/source/blender/python/bmesh/bmesh_py_types_customdata.c
+++ b/source/blender/python/bmesh/bmesh_py_types_customdata.c
@@ -1130,7 +1130,7 @@ PyObject *BPy_BMLayerItem_GetItem(BPy_BMElem *py_ele, BPy_BMLayerItem *py_layer)
       ret = PyBytes_FromStringAndSize(mstring->s, mstring->s_len);
       break;
     }
-    case CD_MLOOPUV: {
+    case CD_PROP_FLOAT2: {
       if (UNLIKELY(py_ele->bm != py_layer->bm)) {
         PyErr_SetString(PyExc_ValueError, "BMElem[layer]: layer is from another mesh");
         return NULL;
diff --git a/source/tools b/source/tools
index 2a541f164a2..dfa16042bf7 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 2a541f164a222ef7bcd036d37687738acee8d946
+Subproject commit dfa16042bf7149475ad318d29a8202d969982abb