diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2014-04-17 20:02:55 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2014-04-17 20:03:08 +0400 |
commit | 38eef8deee4261f0139d29eb81584131a862bf59 (patch) | |
tree | eabdfc91ed986342d938c1fbcda945e768c5b660 /source/blender/makesdna/DNA_customdata_types.h | |
parent | 0ba3f7647071a7bd7fdf48e0d48a9e7e1ee79a7b (diff) |
Refactor to Dyntopo node customdata commit.
Don't use a dedicated node layer but use temporary int layer instead.
Works like a charm as long as we are careful resetting the layer when
needed (after pbvh clearing and always after bmesh has been filled in
undo)
Tip by Campbell, thanks!
Diffstat (limited to 'source/blender/makesdna/DNA_customdata_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index 4869c9a74f1..70dc43676ac 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -63,10 +63,9 @@ 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[42]; /* runtime only! - maps types to indices of first layer of that type, + int typemap[41]; /* 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 pad; int totlayer, maxlayer; /* number of layers, size of layers array */ int totsize; /* in editmode, total size of all data layers */ struct BLI_mempool *pool; /* (BMesh Only): Memory pool for allocation of blocks */ @@ -121,8 +120,7 @@ enum { CD_MLOOPTANGENT = 39, CD_TESSLOOPNORMAL = 40, - CD_DYNTOPO_NODE = 41, - CD_NUMTYPES = 42 + CD_NUMTYPES = 41 }; /* Bits for CustomDataMask */ @@ -170,8 +168,6 @@ enum { #define CD_MASK_MLOOPTANGENT (1LL << CD_MLOOPTANGENT) #define CD_MASK_TESSLOOPNORMAL (1LL << CD_TESSLOOPNORMAL) -#define CD_MASK_DYNTOPO_NODE (1LL << CD_DYNTOPO_NODE) - /* CustomData.flag */ enum { /* Indicates layer should not be copied by CustomData_from_template or CustomData_copy_data */ |