diff options
| -rw-r--r-- | release/ui/space_view3d_toolbar.py | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/paint.c | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py index c8dedd7431c..1308791bdbc 100644 --- a/release/ui/space_view3d_toolbar.py +++ b/release/ui/space_view3d_toolbar.py @@ -292,7 +292,6 @@ class VIEW3D_PT_tools_brush(PaintPanel): settings = self.paint_settings(context) brush = settings.brush - paint = context.sculpt_object or context.vertex_paint_object if not context.particle_edit_object: col = layout.split().column() 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 */ |