diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-16 00:36:15 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-16 00:36:15 +0400 |
| commit | e182d653709a9abd664deaa874f0727ebba83832 (patch) | |
| tree | a91df79e87cc7d7d919a7f4bc8d0e4fc6d78c24d /source/blender/editors/space_buttons | |
| parent | 2b3d2b72ea157a218e1a6e49759e64de77f99850 (diff) | |
2.5/Vertex paint:
* Made vertex paint local to object, like sculpt mode.
* New test for vertex paint is (ob->mode & OB_MODE_VERTEX_PAINT)
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 0be151a11b6..d438490ff7e 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -323,7 +323,7 @@ static int buttons_context_path_brush(const bContext *C, ButsContextPath *path) if(obact && obact->mode & OB_MODE_SCULPT) br= ts->sculpt->brush; - else if(G.f & G_VERTEXPAINT) + else if(obact && obact->mode & OB_MODE_VERTEX_PAINT) br= ts->vpaint->brush; else if(G.f & G_WEIGHTPAINT) br= ts->wpaint->brush; |