diff options
author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2010-07-20 15:32:30 +0400 |
---|---|---|
committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2010-07-20 15:32:30 +0400 |
commit | b618a335f5e7b5b3d291aa0cba8be232b79e9a4e (patch) | |
tree | 1496b8f8c251636d4393de64940c72d07d3346db /source/blender/makesdna | |
parent | d8792465e08313d7ca11ea6f821886330f499540 (diff) |
* Made the default sculpt icons an internal part of the executable
* Default icons can be selected from a menu
* Option to make a custom icon from a file is present but the UI is disabled because of a mysterious crash
* New startup.blend that has the appropriate icons selected
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_brush_types.h | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 5fdc3e6dc5c..01f9ddbe5f1 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -53,8 +53,12 @@ typedef struct Brush { struct BrushClone clone; struct CurveMapping *curve; /* falloff curve */ struct MTex mtex; - struct Image *image_icon; - char image_icon_path[240]; + + struct ImBuf *icon_imbuf; + char icon; + char pad2[7]; + PreviewImage *preview; + char icon_filepath[240]; float normal_weight; @@ -143,6 +147,26 @@ typedef struct Brush { #define SCULPT_TOOL_BLOB 17 #define SCULPT_TOOL_CLAY_TUBES 18 +/* Internal Icons */ +#define BRUSH_ICON_FILE 0 +#define BRUSH_ICON_BLOB 1 +#define BRUSH_ICON_CLAY 2 +#define BRUSH_ICON_CREASE 3 +#define BRUSH_ICON_DRAW 4 +#define BRUSH_ICON_FILL 5 +#define BRUSH_ICON_FLATTEN 6 +#define BRUSH_ICON_GRAB 7 +#define BRUSH_ICON_INFLATE 8 +#define BRUSH_ICON_LAYER 9 +#define BRUSH_ICON_NUDGE 10 +#define BRUSH_ICON_PINCH 11 +#define BRUSH_ICON_SCRAPE 12 +#define BRUSH_ICON_SMOOTH 13 +#define BRUSH_ICON_SNAKE_HOOK 14 +#define BRUSH_ICON_THUMB 15 +#define BRUSH_ICON_TWIST 16 +#define BRUSH_ICON_COUNT 17 + /* ImagePaintSettings.tool */ #define PAINT_TOOL_DRAW 0 #define PAINT_TOOL_SOFTEN 1 |