diff options
author | Matt Ebb <matt@mke3.net> | 2010-01-03 11:37:18 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2010-01-03 11:37:18 +0300 |
commit | 251ef0a47f34806b911ab18b59f604dd0ef3ea5b (patch) | |
tree | 23574564a0d36337c8d2338197c1527cc77e76ca /source/blender/makesdna/DNA_brush_types.h | |
parent | ca4a5f309eed9922eb7d5188173942f36a5adc0d (diff) |
Changes to Brush texture workflow
This changes how textures are accessed from Brushes, with the intention of simplifying
the workflow, and reducing the amount of clicking. Rather than the previous texture slots
(which didn't work as a stack anyway), brushes now have a single texture linked. Rather
than taking time having to set up your slots in advance, you can now select and change
textures directly as you sculpt/paint on the fly. For complex brushes, node textures can
be used, or for fast access, it's easy to make a duplicate of your brush with the texture
you like and assign a hotkey.
Brush textures can now be chosen from a new Textures panel in the brush tool
properties - click on the thumbnail to open a texture selector. This is done using a new
variation on the ID template - the number of rows and columns to display in the popup
can be customised in the UI scripts.
Diffstat (limited to 'source/blender/makesdna/DNA_brush_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_brush_types.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index c8fc14ca0f0..4738b0d81e8 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -31,6 +31,7 @@ #define DNA_BRUSH_TYPES_H #include "DNA_ID.h" +#include "DNA_texture_types.h" #ifndef MAX_MTEX #define MAX_MTEX 18 @@ -50,9 +51,8 @@ typedef struct Brush { ID id; struct BrushClone clone; - struct CurveMapping *curve; /* falloff curve */ - struct MTex *mtex[18]; /* MAX_MTEX */ + struct MTex mtex; short flag, blend; /* general purpose flag, blend mode */ int size; /* brush diameter */ @@ -65,10 +65,8 @@ typedef struct Brush { float rgb[3]; /* color */ float alpha; /* opacity */ - short texact; /* active texture */ char sculpt_tool; /* active tool */ - - char pad[1]; + char pad2[3]; } Brush; /* Brush.flag */ |