Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(2206)

Unified Diff: source/blender/makesdna/DNA_customdata_types.h

Issue 6220055: Skin modifier (Closed) Base URL: https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Patch Set: Updated with suggested changes Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: source/blender/makesdna/DNA_customdata_types.h
===================================================================
--- source/blender/makesdna/DNA_customdata_types.h (revision 46855)
+++ source/blender/makesdna/DNA_customdata_types.h (working copy)
@@ -63,12 +63,11 @@ typedef struct CustomDataExternal {
* layers, each with a data type (e.g. MTFace, MDeformVert, etc.). */
typedef struct CustomData {
CustomDataLayer *layers; /* CustomDataLayers, ordered by type */
- int typemap[36]; /* runtime only! - maps types to indices of first layer of that type,
+ int typemap[37]; /* runtime only! - maps types to indices of first layer of that type,
* MUST be >= CD_NUMTYPES, but we cant use a define here.
* Correct size is ensured in CustomData_update_typemap assert() */
-
int totlayer, maxlayer; /* number of layers, size of layers array */
- int totsize, pad2; /* in editmode, total size of all data layers */
+ int totsize; /* in editmode, total size of all data layers */
void *pool; /* Bmesh: Memory pool for allocation of blocks */
CustomDataExternal *external; /* external file storing customdata layers */
} CustomData;
@@ -114,8 +113,8 @@ typedef struct CustomData {
#define CD_PAINT_MASK 34
#define CD_GRID_PAINT_MASK 35
-
-#define CD_NUMTYPES 36
+#define CD_MVERT_SKIN 36
+#define CD_NUMTYPES 37
/* Bits for CustomDataMask */
#define CD_MASK_MVERT (1 << CD_MVERT)
@@ -156,6 +155,7 @@ typedef struct CustomData {
#define CD_MASK_PAINT_MASK (1LL << CD_PAINT_MASK)
#define CD_MASK_GRID_PAINT_MASK (1LL << CD_GRID_PAINT_MASK)
+#define CD_MASK_MVERT_SKIN (1LL << CD_MVERT_SKIN)
/* CustomData.flag */

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b