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/blenkernel/intern/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/blenkernel/intern/context.c')
-rw-r--r-- | source/blender/blenkernel/intern/context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index ba06768b12a..3210206e16d 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -688,7 +688,7 @@ char *CTX_data_mode_string(const bContext *C) if(ob && (ob->flag & OB_POSEMODE)) return "posemode"; else if (ob && ob->mode & OB_MODE_SCULPT) return "sculpt_mode"; - else if (G.f & G_WEIGHTPAINT) return "weightpaint"; + else if (ob && ob->mode & OB_MODE_WEIGHT_PAINT) return "weightpaint"; else if (ob && ob->mode & OB_MODE_VERTEX_PAINT) return "vertexpaint"; else if (G.f & G_TEXTUREPAINT) return "texturepaint"; else if(G.f & G_PARTICLEEDIT) return "particlemode"; |