1 files changed, 9 insertions, 92 deletions

diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index cf5deb95258..ffb99c10c40 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -25,11 +25,11 @@
  * ***** END GPL LICENSE BLOCK *****
  */ 
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_brush_types.h"
 
 #include "BKE_brush.h"
 #include "BKE_library.h"
@@ -70,91 +70,13 @@ Paint *paint_get_active(Scene *sce)
 
 Brush *paint_brush(Paint *p)
 {
-	return p && p->brushes ? p->brushes[p->active_brush_index] : NULL;
+	return p ? p->brush : NULL;
 }
 
 void paint_brush_set(Paint *p, Brush *br)
 {
-	if(p && !br) {
-		/* Setting to NULL removes the current slot */
-		paint_brush_slot_remove(p);
-	}
-	else if(p) {
-		int found = 0;
-	
-		if(p->brushes) {
-			int i;
-			
-			/* See if there's already a slot with the brush */
-			for(i = 0; i < p->brush_count; ++i) {
-				if(p->brushes[i] == br) {
-					p->active_brush_index = i;
-					found = 1;
-					break;
-				}
-			}
-			
-		}
-		
-		if(!found) {
-			paint_brush_slot_add(p);
-			id_us_plus(&br->id);
-		}
-		
-		/* Make sure the current slot is the new brush */
-		p->brushes[p->active_brush_index] = br;
-	}
-}
-
-static void paint_brush_slots_alloc(Paint *p, const int count)
-{
-	p->brush_count = count;
-	if(count == 0)
-		p->brushes = NULL;
-	else
-		p->brushes = MEM_callocN(sizeof(Brush*) * count, "Brush slots");
-}
-
-void paint_brush_slot_add(Paint *p)
-{
-	if(p) {
-		Brush **orig = p->brushes;
-		int orig_count = p->brushes ? p->brush_count : 0;
-
-		/* Increase size of brush slot array */
-		paint_brush_slots_alloc(p, orig_count + 1);
-		if(orig) {
-			memcpy(p->brushes, orig, sizeof(Brush*) * orig_count);
-			MEM_freeN(orig);
-		}
-
-		p->active_brush_index = orig_count;
-	}
-}
-
-void paint_brush_slot_remove(Paint *p)
-{
-	if(p && p->brushes) {
-		Brush **orig = p->brushes;
-		int src, dst;
-		
-		/* Decrease size of brush slot array */
-		paint_brush_slots_alloc(p, p->brush_count - 1);
-		if(p->brushes) {
-			for(src = 0, dst = 0; dst < p->brush_count; ++src) {
-				if(src != p->active_brush_index) {
-					p->brushes[dst] = orig[src];
-					++dst;
-				}
-			}
-		}
-		MEM_freeN(orig);
-
-		if(p->active_brush_index >= p->brush_count)
-			p->active_brush_index = p->brush_count - 1;
-		if(p->active_brush_index < 0)
-			p->active_brush_index = 0;
-	}
+	if(p)
+		p->brush= br;
 }
 
 int paint_facesel_test(Object *ob)
@@ -168,7 +90,8 @@ void paint_init(Paint *p, const char col[3])
 
 	/* If there's no brush, create one */
 	brush = paint_brush(p);
-	brush_check_exists(&brush, "Brush");
+	if(brush == NULL)
+		brush= add_brush("Brush");
 	paint_brush_set(p, brush);
 
 	memcpy(p->paint_cursor_col, col, 3);
@@ -179,16 +102,10 @@ void paint_init(Paint *p, const char col[3])
 
 void free_paint(Paint *paint)
 {
-	if(paint->brushes)
-		MEM_freeN(paint->brushes);
+	/* nothing */
 }
 
-void copy_paint(Paint *orig, Paint *new)
+void copy_paint(Paint *src, Paint *tar)
 {
-	if(orig->brushes) {
-		int i;
-		new->brushes = MEM_dupallocN(orig->brushes);
-		for(i = 0; i < orig->brush_count; ++i)
-			id_us_plus((ID *)new->brushes[i]);
-	}
+	tar->brush= src->brush;
 }