[Bf-blender-cvs] [567ad738832] usd-importer-T81257-merge: USD Import: revert custom data layer definitions.

[makowalski]

Commit: 567ad738832f0a2929810485893e235c032a4292
Author: makowalski
Date:   Thu Apr 8 13:57:11 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB567ad738832f0a2929810485893e235c032a4292

USD Import: revert custom data layer definitions.

Per review for D10700, removing custom data definitions originally
added for attribute import, as this change requires further
discussion and as additional work is required to complete
the implementation.

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

M	source/blender/makesdna/DNA_customdata_types.h

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

diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index deb5f3393d5..e3b5ecfac04 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -75,8 +75,7 @@ typedef struct CustomData {
    * MUST be >= CD_NUMTYPES, but we cant use a define here.
    * Correct size is ensured in CustomData_update_typemap assert().
    */
-  int typemap[56];
-  char _pad[4];
+  int typemap[51];
   /** Number of layers, size of layers array. */
   int totlayer, maxlayer;
   /** In editmode, total size of all data layers. */
@@ -158,14 +157,7 @@ typedef enum CustomDataType {
 
   CD_PROP_BOOL = 50,
 
-  CD_VALUE_FLOAT = 51,
-  CD_VALUE_INT = 52,
-  CD_VALUE_F3 = 53,
-  CD_VALUE_I3 = 54,
-
-  CD_VELOCITY = 55,
-
-  CD_NUMTYPES = 56,
+  CD_NUMTYPES = 51,
 } CustomDataType;
 
 /* Bits for CustomDataMask */