diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-17 19:17:45 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-17 19:17:45 +0400 |
| commit | 21ca9a6049b7e0948752f06a952d9e13a2966117 (patch) | |
| tree | 162885250e66d90cbf3727c85b8ff0cda261a75a /source/blender/blenkernel | |
| parent | b0fe88117b923da49486f765521ed4c3d1b58965 (diff) | |
2.5 paint:
* Fixed texture paint UI
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/paint.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 79d1df3d67f..54192afb904 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -52,8 +52,7 @@ Paint *paint_get_active(Scene *sce) case OB_MODE_WEIGHT_PAINT: return &ts->wpaint->paint; case OB_MODE_TEXTURE_PAINT: - break; - //return &ts->imapaint->paint; + return &ts->imapaint.paint; } } @@ -67,14 +66,14 @@ Brush *paint_brush(Paint *p) void paint_brush_set(Paint *p, Brush *br) { - if(!br) { + if(p && !br) { /* Setting to NULL removes the current slot */ paint_brush_slot_remove(p); } - else { + else if(p) { int found = 0; - if(p && p->brushes) { + if(p->brushes) { int i; /* See if there's already a slot with the brush */ |