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/editors/space_node | |
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/editors/space_node')
-rw-r--r-- | source/blender/editors/space_node/node_edit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 721f8a50256..d19dc897a89 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -56,6 +56,7 @@ #include "BKE_main.h" #include "BKE_node.h" #include "BKE_material.h" +#include "BKE_paint.h" #include "BKE_texture.h" #include "BKE_scene.h" #include "BKE_utildefines.h" @@ -625,10 +626,9 @@ void snode_set_context(SpaceNode *snode, Scene *scene) MTex *mtex= NULL; if(ob && ob->mode & OB_MODE_SCULPT) { - Sculpt *sd= scene->toolsettings->sculpt; - if(sd && sd->brush) - if(sd->brush->texact != -1) - mtex= sd->brush->mtex[sd->brush->texact]; + Brush *brush = paint_brush(&scene->toolsettings->sculpt->paint); + if(brush && brush->texact != -1) + mtex= brush->mtex[brush->texact]; } else { Brush *br= scene->toolsettings->imapaint.brush; |