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_buttons/buttons_context.c | |
| 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_buttons/buttons_context.c')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 318e0b0f558..6b89532cdaf 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -322,16 +322,8 @@ static int buttons_context_path_brush(const bContext *C, ButsContextPath *path) scene= path->ptr[path->len-1].data; ts= scene->toolsettings; - if(obact) { - if(obact->mode & OB_MODE_SCULPT) - paint_brush(&ts->sculpt->paint); - else if(obact->mode & OB_MODE_VERTEX_PAINT) - paint_brush(&ts->vpaint->paint); - else if(obact->mode & OB_MODE_WEIGHT_PAINT) - paint_brush(&ts->wpaint->paint); - else if(obact->mode & OB_MODE_TEXTURE_PAINT) - br= ts->imapaint.brush; - } + if(scene) + br= paint_brush(paint_get_active(scene)); if(br) { RNA_id_pointer_create(&br->id, &path->ptr[path->len]); |