diff options
author | Matt Ebb <matt@mke3.net> | 2010-01-20 11:30:40 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2010-01-20 11:30:40 +0300 |
commit | 02ca0fda8ea86c5b5b05b8d1ef6cc81e8f280523 (patch) | |
tree | 37fc44b7dab5951dbaa6c45899be99178df6b210 /source/blender/makesdna | |
parent | e8b123a1e46270de28c00d87dba8fd4c1ca2a416 (diff) |
Moved the image paint tool and the vertex/weight paint tool (blend mode?)
to the Brush data. This now works the same way as sculpt, with named
preset brushes that retain settings.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_brush_types.h | 6 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 4738b0d81e8..45ace37866b 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -65,8 +65,10 @@ typedef struct Brush { float rgb[3]; /* color */ float alpha; /* opacity */ - char sculpt_tool; /* active tool */ - char pad2[3]; + char sculpt_tool; /* active sculpt tool */ + char vertexpaint_tool; /* active vertex/weight paint tool/blend mode */ + char imagepaint_tool; /* active image paint tool */ + char pad2; } Brush; /* Brush.flag */ diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 7ea4bb1b022..d10c0451eb7 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -510,7 +510,7 @@ typedef struct Paint { typedef struct ImagePaintSettings { Paint paint; - short flag, tool; + short flag, pad; /* for projection painting only */ short seam_bleed, normal_angle; @@ -565,7 +565,7 @@ typedef struct Sculpt { typedef struct VPaint { Paint paint; - short mode, flag; + short flag, pad; int tot; /* allocation size of prev buffers */ unsigned int *vpaint_prev; /* previous mesh colors */ struct MDeformVert *wpaint_prev; /* previous vertex weights */ |