diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-16 23:50:00 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-16 23:50:00 +0400 |
commit | afa0fa5e29de94b093f4eda2f8105faa59ba5573 (patch) | |
tree | c7fa9cf5336e472ac10a95e78a2ac179ee0d97fd /source/blender/blenkernel/intern/brush.c | |
parent | d5c990664e421567f45df7c6148cc5786aa2dbd7 (diff) |
2.5 Sculpt:
* Added a new Paint type in scene DNA. This is now the base struct for Sculpt.
* The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots.
* Modified the UI for the new Paint type, now shows the list of brushes active for this mode
* Added a New Brush operator, shows in the UI as a list of brush tool types to add
* Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types
TODO:
* Vertex paint, weight paint, texture paint need to be converted to this system next
* Add brush presets to the default blend
Diffstat (limited to 'source/blender/blenkernel/intern/brush.c')
-rw-r--r-- | source/blender/blenkernel/intern/brush.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index ca21345e37f..ebde6e0077f 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -62,7 +62,7 @@ /* Datablock add/copy/free/make_local */ -Brush *add_brush(char *name) +Brush *add_brush(const char *name) { Brush *brush; @@ -186,23 +186,6 @@ void make_local_brush(Brush *brush) /* Library Operations */ -Brush **current_brush_source(Scene *sce) -{ - Object *ob = sce->basact ? sce->basact->object : NULL; - - if(ob) { - if(ob->mode & OB_MODE_SCULPT) - return &sce->toolsettings->sculpt->brush; - else if(ob->mode & OB_MODE_VERTEX_PAINT) - return &sce->toolsettings->vpaint->brush; - else if(ob->mode & OB_MODE_WEIGHT_PAINT) - return &sce->toolsettings->wpaint->brush; - else if(ob->mode & OB_MODE_TEXTURE_PAINT) - return &sce->toolsettings->imapaint.brush; - } - return NULL; -} - int brush_set_nr(Brush **current_brush, int nr) { ID *idtest, *id; |