[Bf-blender-cvs] [291d2a2222f] master: Cleanup: Remove misleading comments

Hans Goudey noreply at git.blender.org
Fri Dec 24 18:00:08 CET 2021


Commit: 291d2a2222fc98fdf18b5c250e289a2213acc4d8
Author: Hans Goudey
Date:   Fri Dec 24 11:00:01 2021 -0600
Branches: master
https://developer.blender.org/rB291d2a2222fc98fdf18b5c250e289a2213acc4d8

Cleanup: Remove misleading comments

Most of these custom data layers weren't BMesh only, and the
one that actually looks to be BMesh only has `BM` in its name.

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

M	source/blender/blenkernel/intern/customdata.c
M	source/blender/makesdna/DNA_customdata_types.h

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

diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 090de26c230..276dd94db41 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1685,8 +1685,6 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     {sizeof(float[3]), "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
     /* 24: CD_RECAST */
     {sizeof(MRecast), "MRecast", 1, N_("Recast"), NULL, NULL, NULL, NULL},
-
-    /* BMESH ONLY */
     /* 25: CD_MPOLY */
     {sizeof(MPoly), "MPoly", 1, N_("NGon Face"), NULL, NULL, NULL, NULL, NULL},
     /* 26: CD_MLOOP */
@@ -1743,9 +1741,6 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
      NULL,
      NULL,
      NULL},
-
-    /* END BMESH ONLY */
-
     /* 34: CD_PAINT_MASK */
     {sizeof(float), "", 0, NULL, NULL, NULL, layerInterp_paint_mask, NULL, NULL},
     /* 35: CD_GRID_PAINT_MASK */
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index 36bdd4915ff..787dbc23515 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -134,7 +134,6 @@ typedef enum CustomDataType {
   CD_CLOTH_ORCO = 23,
   /* CD_RECAST = 24, */ /* UNUSED */
 
-  /* BMESH ONLY START */
   CD_MPOLY = 25,
   CD_MLOOP = 26,
   CD_SHAPE_KEYINDEX = 27,
@@ -144,7 +143,6 @@ typedef enum CustomDataType {
   CD_ORIGSPACE_MLOOP = 31,
   CD_PREVIEW_MLOOPCOL = 32,
   CD_BM_ELEM_PYPTR = 33,
-  /* BMESH ONLY END */
 
   CD_PAINT_MASK = 34,
   CD_GRID_PAINT_MASK = 35,
@@ -164,7 +162,6 @@ typedef enum CustomDataType {
   CD_PROP_COLOR = 47,
   CD_PROP_FLOAT3 = 48,
   CD_PROP_FLOAT2 = 49,
-
   CD_PROP_BOOL = 50,
 
   CD_HAIRLENGTH = 51,
@@ -197,7 +194,6 @@ typedef enum CustomDataType {
 #define CD_MASK_CLOTH_ORCO (1 << CD_CLOTH_ORCO)
 // #define CD_MASK_RECAST (1 << CD_RECAST)  /* DEPRECATED */
 
-/* BMESH ONLY START */
 #define CD_MASK_MPOLY (1 << CD_MPOLY)
 #define CD_MASK_MLOOP (1 << CD_MLOOP)
 #define CD_MASK_SHAPE_KEYINDEX (1 << CD_SHAPE_KEYINDEX)
@@ -207,7 +203,6 @@ typedef enum CustomDataType {
 #define CD_MASK_ORIGSPACE_MLOOP (1LL << CD_ORIGSPACE_MLOOP)
 #define CD_MASK_PREVIEW_MLOOPCOL (1LL << CD_PREVIEW_MLOOPCOL)
 #define CD_MASK_BM_ELEM_PYPTR (1LL << CD_BM_ELEM_PYPTR)
-/* BMESH ONLY END */
 
 #define CD_MASK_PAINT_MASK (1LL << CD_PAINT_MASK)
 #define CD_MASK_GRID_PAINT_MASK (1LL << CD_GRID_PAINT_MASK)



More information about the Bf-blender-cvs mailing list