diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-05-23 07:24:15 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-05-23 07:24:15 +0400 |
| commit | f026266e185f90543138a856898f50b2295a12fc (patch) | |
| tree | f674a1a1b328a423ec4bdcdc4a11f35e56669e7a /source/blender/makesdna/DNA_customdata_types.h | |
| parent | b7fe3258b66698f62f630d0b18431b54b65101ed (diff) | |
merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.
[[Split portion of a mixed commit.]]
Diffstat (limited to 'source/blender/makesdna/DNA_customdata_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index 510ccfb67fc..18c18d9e9dd 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -75,9 +75,8 @@ typedef struct CustomData { #define CD_MLOOPCOL 17 #define CD_TANGENT 18 #define CD_MDISPS 19 -#define CD_NUMTYPES 20 - /* fake type, derivedmesh wants CustomDataMask for weightpaint too, is not stored */ -#define CD_WEIGHTPAINT 30 +#define CD_WEIGHT_MCOL 20 /* for displaying weightpaint colors */ +#define CD_NUMTYPES 21 /* Bits for CustomDataMask */ #define CD_MASK_MVERT (1 << CD_MVERT) @@ -100,6 +99,7 @@ typedef struct CustomData { #define CD_MASK_MLOOPCOL (1 << CD_MLOOPCOL) #define CD_MASK_TANGENT (1 << CD_TANGENT) #define CD_MASK_MDISPS (1 << CD_MDISPS) +#define CD_MASK_WEIGHT_MCOL (1 << CD_WEIGHT_MCOL) /* derivedmesh wants CustomDataMask for weightpaint too, is not customdata though */ #define CD_MASK_WEIGHTPAINT (1 << CD_WEIGHTPAINT) |