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

[Martijn Versteegh]

Commit: e497f7ccbbfaeaf0ee48695b54e89b6acd27a915
Author: Martijn Versteegh
Date:   Fri Dec 23 14:50:17 2022 +0100
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rBe497f7ccbbfaeaf0ee48695b54e89b6acd27a915

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

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



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

diff --cc source/blender/editors/mesh/mesh_data.cc
index 2cf13dd73d8,a2310dddc61..bd99dc92db3
--- a/source/blender/editors/mesh/mesh_data.cc
+++ b/source/blender/editors/mesh/mesh_data.cc
@@@ -120,7 -117,7 +120,7 @@@ static void delete_customdata_layer(Mes
    int layer_index, tot, n;
  
    char htype = BM_FACE;
--  if (ELEM(type, CD_PROP_BYTE_COLOR, CD_MLOOPUV)) {
++  if (ELEM(type, CD_PROP_BYTE_COLOR, CD_PROP_FLOAT2)) {
      htype = BM_LOOP;
    }
    else if (ELEM(type, CD_PROP_COLOR)) {