diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-16 05:25:53 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-16 05:25:53 +0400 |
| commit | ebf1c5faca86286aa90ab5ab9fc4d3ddb1f51cdf (patch) | |
| tree | 1e457366adcd664233760e5e17b20aa6c3f8e4a2 /source/blender/blenkernel/intern/paint.c | |
| parent | db1cab0f3a75562eebf5aea93753e77582a4c3e4 (diff) | |
2.5/Texture paint
* Made texture paint object-localized too.
Note for Brecht: gpu_draw.c had three uses of G_TEXTUREPAINT that I was not able to cleanly fix, so commented out for now. Can you take a look and see what should be done here?
Diffstat (limited to 'source/blender/blenkernel/intern/paint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/paint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 4081729ec5e..f47a44aff03 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -32,6 +32,6 @@ int paint_facesel_test(Object *ob) { - return (G.f&G_FACESELECT) && ((G.f & G_TEXTUREPAINT) || (ob && (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT)))); + return (G.f&G_FACESELECT) && (ob && (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT))); } |