diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-01-07 07:38:30 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-01-07 07:38:30 +0300 |
| commit | a811d802dd96a2dc93885a1dab46004084386030 (patch) | |
| tree | 42e09725613129f591b0b97f4d06d931bfd89ab6 /source/blender/makesdna/DNA_brush_types.h | |
| parent | 23e3fdb28b1d0c7d7d8992c2835bd492daef528c (diff) | |
Changes/cleanup for sculptdata and brushes. Summary:
* Removed texfade, wasn't a very useful option (same result can be created with the falloff curve)
* Removed CurveMapping from sculptdata, moved instead to Brush
* Removed rake field from sculptdata, moved to Brush.flag
* Moved Anchored flag from sculpt to Brush, same for direction field
* Removed BrushData, replaced usages with the regular Brush type
* Removed hardcoded brushes and brush_type from sculptdata, replaced with a pointer to the current Brush
* Made sculpt tool type settable in Brush
* Changed symmetry and axis lock fields to flags
Diffstat (limited to 'source/blender/makesdna/DNA_brush_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_brush_types.h | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index c7196763358..bca5546dd80 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -36,6 +36,7 @@ #define MAX_MTEX 18 #endif +struct CurveMapping; struct MTex; struct Image; @@ -47,6 +48,11 @@ typedef struct BrushClone { typedef struct Brush { ID id; + + struct BrushClone clone; + + struct CurveMapping *curve; /* falloff curve */ + struct MTex *mtex[18]; /* MAX_MTEX */ short flag, blend; /* general purpose flag, blend mode */ int size; /* brush diameter */ @@ -57,10 +63,8 @@ typedef struct Brush { float rgb[3]; /* color */ float alpha; /* opacity */ - short texact, pad; - struct MTex *mtex[18]; /* MAX_MTEX */ - - struct BrushClone clone; + short texact; /* active texture */ + char sculpt_tool, pad; /* active tool */ } Brush; /* Brush.flag */ @@ -71,6 +75,9 @@ typedef struct Brush { #define BRUSH_RAD_PRESSURE 16 #define BRUSH_SPACING_PRESSURE 32 #define BRUSH_FIXED_TEX 64 +#define BRUSH_RAKE 128 +#define BRUSH_ANCHORED 256 +#define BRUSH_DIR_IN 512 /* Brush.blend */ #define BRUSH_BLEND_MIX 0 @@ -82,6 +89,15 @@ typedef struct Brush { #define BRUSH_BLEND_ERASE_ALPHA 6 #define BRUSH_BLEND_ADD_ALPHA 7 +/* Brush.sculpt_tool */ +#define SCULPT_TOOL_DRAW 1 +#define SCULPT_TOOL_SMOOTH 2 +#define SCULPT_TOOL_PINCH 3 +#define SCULPT_TOOL_INFLATE 4 +#define SCULPT_TOOL_GRAB 5 +#define SCULPT_TOOL_LAYER 6 +#define SCULPT_TOOL_FLATTEN 7 + #define PAINT_TOOL_DRAW 0 #define PAINT_TOOL_SOFTEN 1 #define PAINT_TOOL_SMEAR 2 |