From 21ca9a6049b7e0948752f06a952d9e13a2966117 Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Mon, 17 Aug 2009 15:17:45 +0000 Subject: 2.5 paint: * Fixed texture paint UI --- source/blender/blenkernel/intern/paint.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'source/blender/blenkernel/intern/paint.c') 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 */ -- cgit v1.2.3