diff options
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_brush_types.h | 3 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 7 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_mesh_defaults.h | 1 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 7 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 3 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_view3d_defaults.h | 1 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 2 |
7 files changed, 19 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 2b7e9246d36..0109fba909b 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -227,6 +227,7 @@ typedef enum eBrushClothForceFalloffType { typedef enum eAutomasking_flag { BRUSH_AUTOMASKING_TOPOLOGY = (1 << 0), + BRUSH_AUTOMASKING_FACE_SETS = (1 << 1), } eAutomasking_flag; typedef struct Brush { @@ -540,6 +541,7 @@ typedef enum eBrushSculptTool { SCULPT_TOOL_SLIDE_RELAX = 24, SCULPT_TOOL_CLAY_THUMB = 25, SCULPT_TOOL_CLOTH = 26, + SCULPT_TOOL_DRAW_FACE_SETS = 27, } eBrushSculptTool; /* Brush.uv_sculpt_tool */ @@ -582,6 +584,7 @@ typedef enum eBrushUVSculptTool { SCULPT_TOOL_SLIDE_RELAX, \ SCULPT_TOOL_ELASTIC_DEFORM, \ SCULPT_TOOL_POSE, \ + SCULPT_TOOL_DRAW_FACE_SETS, \ \ /* These brushes could handle dynamic topology, \ \ * but user feedback indicates it's better not to */ \ diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index 552de61df8a..4d0d66f29ff 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -76,8 +76,7 @@ typedef struct CustomData { * MUST be >= CD_NUMTYPES, but we cant use a define here. * Correct size is ensured in CustomData_update_typemap assert(). */ - int typemap[42]; - char _pad0[4]; + int typemap[43]; /** Number of layers, size of layers array. */ int totlayer, maxlayer; /** In editmode, total size of all data layers. */ @@ -146,8 +145,9 @@ typedef enum CustomDataType { CD_MLOOPTANGENT = 39, CD_TESSLOOPNORMAL = 40, CD_CUSTOMLOOPNORMAL = 41, + CD_SCULPT_FACE_SETS = 42, - CD_NUMTYPES = 42, + CD_NUMTYPES = 43, } CustomDataType; /* Bits for CustomDataMask */ @@ -195,6 +195,7 @@ typedef enum CustomDataType { #define CD_MASK_MLOOPTANGENT (1LL << CD_MLOOPTANGENT) #define CD_MASK_TESSLOOPNORMAL (1LL << CD_TESSLOOPNORMAL) #define CD_MASK_CUSTOMLOOPNORMAL (1LL << CD_CUSTOMLOOPNORMAL) +#define CD_MASK_SCULPT_FACE_SETS (1LL << CD_SCULPT_FACE_SETS) /** Data types that may be defined for all mesh elements types. */ #define CD_MASK_GENERIC_DATA (CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR) diff --git a/source/blender/makesdna/DNA_mesh_defaults.h b/source/blender/makesdna/DNA_mesh_defaults.h index f605827d120..275bcc64562 100644 --- a/source/blender/makesdna/DNA_mesh_defaults.h +++ b/source/blender/makesdna/DNA_mesh_defaults.h @@ -35,6 +35,7 @@ .texflag = ME_AUTOSPACE, \ .remesh_voxel_size = 0.1f, \ .remesh_voxel_adaptivity = 0.0f, \ + .face_sets_color_seed = 0, \ .flag = ME_REMESH_FIX_POLES | ME_REMESH_REPROJECT_VOLUME, \ } diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 86ea22690ee..c0c7c0465bb 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -196,7 +196,11 @@ typedef struct Mesh { float remesh_voxel_size; float remesh_voxel_adaptivity; char remesh_mode; - char _pad1[3]; + + char _pad1[7]; + + int face_sets_color_seed; + /** Deprecated multiresolution modeling data, only keep for loading old files. */ struct Multires *mr DNA_DEPRECATED; @@ -258,6 +262,7 @@ enum { ME_REMESH_REPROJECT_PAINT_MASK = 1 << 12, ME_REMESH_FIX_POLES = 1 << 13, ME_REMESH_REPROJECT_VOLUME = 1 << 14, + ME_REMESH_REPROJECT_SCULPT_FACE_SETS = 1 << 15, }; /* me->cd_flag */ diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 71f701b87ad..8617f122d55 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -2211,6 +2211,9 @@ typedef enum eSculptFlags { /* Don't display mask in viewport, but still use it for strokes. */ SCULPT_HIDE_MASK = (1 << 15), + + /* Don't display face sets in viewport. */ + SCULPT_HIDE_FACE_SETS = (1 << 16), } eSculptFlags; /* ImagePaintSettings.mode */ diff --git a/source/blender/makesdna/DNA_view3d_defaults.h b/source/blender/makesdna/DNA_view3d_defaults.h index f6c8c0b1f6d..c139d4dc0d1 100644 --- a/source/blender/makesdna/DNA_view3d_defaults.h +++ b/source/blender/makesdna/DNA_view3d_defaults.h @@ -59,6 +59,7 @@ /* Intentionally different to vertex/paint mode, \ * we typically want to see shading too. */ \ .sculpt_mode_mask_opacity = 0.75f, \ + .sculpt_mode_face_sets_opacity = 0.0f, \ \ .edit_flag = V3D_OVERLAY_EDIT_FACES | V3D_OVERLAY_EDIT_SEAMS | \ V3D_OVERLAY_EDIT_SHARP | V3D_OVERLAY_EDIT_FREESTYLE_EDGE | \ diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index c45a1480087..ce0c68055d9 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -210,9 +210,9 @@ typedef struct View3DOverlay { float vertex_paint_mode_opacity; float weight_paint_mode_opacity; float sculpt_mode_mask_opacity; + float sculpt_mode_face_sets_opacity; /** Armature edit/pose mode settings. */ - int _pad3; float xray_alpha_bone; /** Other settings. */ |