diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-16 01:46:25 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-16 01:46:25 +0400 |
| commit | b8aff064662d5c89f909c31ffac216286270d185 (patch) | |
| tree | a27469c270cabd35a52ce3dbee381e5048c7d220 /source/blender/editors/space_buttons | |
| parent | e182d653709a9abd664deaa874f0727ebba83832 (diff) | |
2.5/Paint:
* Weightpaint is now object-local like sculpt and vertexpaint.
* Fixed a bug spotted by DingTo, going from editmode to sculptmode didn't fully leave editmode
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index d438490ff7e..a1e1c589449 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -325,7 +325,7 @@ static int buttons_context_path_brush(const bContext *C, ButsContextPath *path) br= ts->sculpt->brush; else if(obact && obact->mode & OB_MODE_VERTEX_PAINT) br= ts->vpaint->brush; - else if(G.f & G_WEIGHTPAINT) + else if(obact && obact->mode & OB_MODE_WEIGHT_PAINT) br= ts->wpaint->brush; else if(G.f & G_TEXTUREPAINT) br= ts->imapaint.brush; |