Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-09-11 03:49:39 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-09-11 03:49:39 +0400
commit75b393612809252349bf4062bc45df14c1a5dfe5 (patch)
tree12650c13c6e927a9e084491aca3d09b77f4f4974 /source/blender/makesdna/DNA_customdata_types.h
parentceb9b237f224a480ef13ca151af07aa2d1e1ea60 (diff)
parentfbf3a76f1d4b50b81334f55efbff7a1e6ba1f413 (diff)
svn merge -r40075:40104 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/makesdna/DNA_customdata_types.h')
-rw-r--r--source/blender/makesdna/DNA_customdata_types.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index 0760ba0542f..eba484b84b7 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -100,7 +100,8 @@ typedef struct CustomData {
#define CD_BWEIGHT 28
#define CD_CREASE 29
#define CD_WEIGHT_MLOOPCOL 30
-#define CD_NUMTYPES 31
+#define CD_RECAST 31
+#define CD_NUMTYPES 32
/* Bits for CustomDataMask */
#define CD_MASK_MVERT (1 << CD_MVERT)
@@ -130,6 +131,7 @@ typedef struct CustomData {
#define CD_MASK_SHAPE_KEYINDEX (1 << CD_SHAPE_KEYINDEX)
#define CD_MASK_SHAPEKEY (1 << CD_SHAPEKEY)
#define CD_MASK_CLOTH_ORCO (1 << CD_CLOTH_ORCO)
+#define CD_MASK_RECAST (1 << CD_RECAST)
/* derivedmesh wants CustomDataMask for weightpaint too, is not customdata though */
#define CD_MASK_WEIGHTPAINT (1 << CD_WEIGHTPAINT)