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/transform/transform_manipulator.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/transform/transform_manipulator.c')
| -rw-r--r-- | source/blender/editors/transform/transform_manipulator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index be377f6af83..40966380cca 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -358,10 +358,10 @@ int calc_manipulator_stats(const bContext *C) Mat4MulVecfl(ob->obmat, scene->twmax); } } - else if(G.f & (G_TEXTUREPAINT + G_WEIGHTPAINT)) { + else if(G.f & G_TEXTUREPAINT) { ; } - else if(ob && (ob->mode & (OB_MODE_SCULPT|OB_MODE_VERTEX_PAINT))) { + else if(ob && (ob->mode & (OB_MODE_SCULPT|OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT))) { ; } else if(G.f & G_PARTICLEEDIT) { |