diff options
Diffstat (limited to 'source/blender/makesdna/DNA_mesh_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index cb6991ce67a..fb9e522dfa9 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -116,8 +116,6 @@ typedef struct Mesh { /** Animation data (must be immediately after id for utilities to use it). */ struct AnimData *adt; - struct BoundBox *bb; - /** Old animation system, deprecated for 2.5. */ struct Ipo *ipo DNA_DEPRECATED; struct Key *key; @@ -177,7 +175,6 @@ typedef struct Mesh { /* texture space, copied as one block in editobject.c */ float loc[3]; float size[3]; - float rot[3]; short texflag, flag; float smoothresh; @@ -193,7 +190,9 @@ typedef struct Mesh { short totcol; float remesh_voxel_size; - char _pad1[4]; + float remesh_voxel_adaptivity; + char remesh_mode; + char _pad1[3]; /** Deprecated multiresolution modeling data, only keep for loading old files. */ struct Multires *mr DNA_DEPRECATED; @@ -217,6 +216,7 @@ typedef struct TFace { /* texflag */ enum { ME_AUTOSPACE = 1, + ME_AUTOSPACE_EVALUATED = 2, }; /* me->editflag */ @@ -252,6 +252,8 @@ enum { ME_SCULPT_DYNAMIC_TOPOLOGY = 1 << 10, ME_REMESH_SMOOTH_NORMALS = 1 << 11, ME_REMESH_REPROJECT_PAINT_MASK = 1 << 12, + ME_REMESH_FIX_POLES = 1 << 13, + ME_REMESH_REPROJECT_VOLUME = 1 << 14, }; /* me->cd_flag */ @@ -261,6 +263,12 @@ enum { ME_CDFLAG_EDGE_CREASE = 1 << 2, }; +/* me->remesh_mode */ +enum { + REMESH_VOXEL = 0, + REMESH_QUAD = 1, +}; + /* Subsurf Type */ enum { ME_CC_SUBSURF = 0, |