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/screen/screen_context.c | |
| 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/screen/screen_context.c')
| -rw-r--r-- | source/blender/editors/screen/screen_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 0ac9333aafc..31e301f06bc 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -128,7 +128,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult return 1; } else if(CTX_data_equals(member, "weight_paint_object")) { - if(G.f & G_WEIGHTPAINT && scene->basact) + if(ob && (ob->mode & OB_MODE_WEIGHT_PAINT)) CTX_data_id_pointer_set(result, &scene->basact->object->id); return 1; |