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/brush.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/brush.c')
| -rw-r--r-- | source/blender/blenkernel/intern/brush.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index e026ccdcec6..ca21345e37f 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -197,9 +197,9 @@ Brush **current_brush_source(Scene *sce) return &sce->toolsettings->vpaint->brush; else if(ob->mode & OB_MODE_WEIGHT_PAINT) return &sce->toolsettings->wpaint->brush; + else if(ob->mode & OB_MODE_TEXTURE_PAINT) + return &sce->toolsettings->imapaint.brush; } - else if(G.f & G_TEXTUREPAINT) - return &sce->toolsettings->imapaint.brush; return NULL; } |