diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-17 08:40:59 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-17 08:40:59 +0400 |
| commit | a3b317daf7fbaa2359afbfdf0524b590d3622f2e (patch) | |
| tree | af7876365655c372b4a7a3e16c41fde9b725d3ad /source/blender/editors/space_node | |
| parent | 3425925a7702c0a5527c60b2da044dad378d7f2c (diff) | |
2.5 Texture paint:
* Converted to use Paint struct. Now all the brush modes are done.
TODO:
* Make the UI better
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/node_edit.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index d19dc897a89..d66cbb55baa 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -624,17 +624,18 @@ void snode_set_context(SpaceNode *snode, Scene *scene) } else { MTex *mtex= NULL; + Brush *brush= NULL; if(ob && ob->mode & OB_MODE_SCULPT) { - Brush *brush = paint_brush(&scene->toolsettings->sculpt->paint); + brush= paint_brush(&scene->toolsettings->sculpt->paint); + } + else + brush= paint_brush(&scene->toolsettings->imapaint.paint); + + if(brush) { if(brush && brush->texact != -1) mtex= brush->mtex[brush->texact]; } - else { - Brush *br= scene->toolsettings->imapaint.brush; - if(br) - mtex= br->mtex[br->texact]; - } if(mtex) { snode->from= (ID *)scene; |