Brush/Paint internal changes

- remove brush array for each Paint struct, just use a single brush pointer.
- removed rna function based template filtering.
- filter brushes using a flag on the brush and the pointer poll function.
- set the brushes using a new operator WM_OT_context_set_id().

TODO
- remake startup.blend, currently brush groupings are lost.
- rewrite WM_OT_context_set_id() to use rna introspection.

4 files changed, 17 insertions, 171 deletions

diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h
index 3afcfddfea3..0e406a16d0c 100644
--- a/source/blender/blenkernel/BKE_brush.h
+++ b/source/blender/blenkernel/BKE_brush.h
@@ -50,10 +50,7 @@ void brush_reset_sculpt(struct Brush *brush);
 struct ImBuf *get_brush_icon(struct Brush *brush);
 
 /* brush library operations used by different paint panels */
-int brush_set_nr(struct Brush **current_brush, int nr, const char *name);
 int brush_delete(struct Brush **current_brush);
-void brush_check_exists(struct Brush **brush, const char *name);
-void brush_toggled_fake_user(struct Brush *brush);
 int brush_texture_set_nr(struct Brush *brush, int nr);
 int brush_texture_delete(struct Brush *brush);
 int brush_clone_image_set_nr(struct Brush *brush, int nr);
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 95293f16d9d..20742033a2e 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -47,21 +47,17 @@ extern const char PAINT_CURSOR_TEXTURE_PAINT[3];
 
 void paint_init(struct Paint *p, const char col[3]);
 void free_paint(struct Paint *p);
-void copy_paint(struct Paint *orig, struct Paint *new);
+void copy_paint(struct Paint *src, struct Paint *tar);
 
 struct Paint *paint_get_active(struct Scene *sce);
 struct Brush *paint_brush(struct Paint *paint);
 void paint_brush_set(struct Paint *paint, struct Brush *br);
-void paint_brush_slot_add(struct Paint *p);
-void paint_brush_slot_remove(struct Paint *p);
 
 /* testing face select mode
  * Texture paint could be removed since selected faces are not used
  * however hiding faces is useful */
 int paint_facesel_test(struct Object *ob);
 
-int paint_has_brush(struct Paint *p, struct Brush *brush);
-
 /* Session data (mode-specific) */
 
 typedef struct SculptSession {
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index b9d7ea177d4..905515914b4 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -35,6 +35,7 @@
 #include "DNA_brush_types.h"
 #include "DNA_color_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_object_types.h"
 #include "DNA_windowmanager_types.h"
 
 #include "WM_types.h"
@@ -67,6 +68,8 @@ static void brush_set_defaults(Brush *brush)
 	brush->blend = 0;
 	brush->flag = 0;
 
+	brush->ob_mode = (OB_MODE_SCULPT|OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT);
+
 	/* BRUSH SCULPT TOOL SETTINGS */
 	brush->size= 35; /* radius of the brush in pixels */
 	brush->alpha= 0.5f; /* brush strength/intensity probably variable should be renamed? */
@@ -120,6 +123,9 @@ Brush *add_brush(const char *name)
 
 	brush= alloc_libblock(&G.main->brush, ID_BR, name);
 
+	/* enable fake user by default */
+	brush->id.flag |= LIB_FAKEUSER;
+
 	brush_set_defaults(brush);
 
 	brush->sculpt_tool = SCULPT_TOOL_DRAW; /* sculpting defaults to the draw tool for new brushes */
@@ -127,10 +133,6 @@ Brush *add_brush(const char *name)
 	 /* the default alpha falloff curve */
 	brush_curve_preset(brush, CURVE_PRESET_SMOOTH);
 
-	/* enable fake user by default */
-	brush->id.flag |= LIB_FAKEUSER;
-	brush_toggled_fake_user(brush);
-
 	return brush;
 }
 
@@ -151,7 +153,7 @@ Brush *copy_brush(Brush *brush)
 	/* enable fake user by default */
 	if (!(brushn->id.flag & LIB_FAKEUSER)) {
 		brushn->id.flag |= LIB_FAKEUSER;
-		brush_toggled_fake_user(brushn);
+		brushn->id.us++;
 	}
 	
 	return brushn;
@@ -205,7 +207,7 @@ void make_local_brush(Brush *brush)
 		/* enable fake user by default */
 		if (!(brush->id.flag & LIB_FAKEUSER)) {
 			brush->id.flag |= LIB_FAKEUSER;
-			brush_toggled_fake_user(brush);
+			brush->id.us++;
 		}
 	}
 	else if(local && lib) {
@@ -393,54 +395,6 @@ void brush_reset_sculpt(Brush *br)
 }
 
 /* Library Operations */
-
-int brush_set_nr(Brush **current_brush, int nr, const char *name)
-{
-	ID *idtest, *id;
-	
-	id= (ID*)(*current_brush);
-	idtest= (ID*)BLI_findlink(&G.main->brush, nr-1);
-	
-	if(idtest==0) { /* new brush */
-		if(id) idtest= (ID *)copy_brush((Brush *)id);
-		else idtest= (ID *)add_brush(name);
-		idtest->us--;
-	}
-	if(idtest!=id) {
-		brush_delete(current_brush);
-		*current_brush= (Brush *)idtest;
-		id_us_plus(idtest);
-
-		return 1;
-	}
-
-	return 0;
-}
-
-int brush_delete(Brush **current_brush)
-{
-	if (*current_brush) {
-		(*current_brush)->id.us--;
-		*current_brush= NULL;
-
-		return 1;
-	}
-
-	return 0;
-}
-
-void brush_toggled_fake_user(Brush *brush)
-{
-	ID *id= (ID*)brush;
-	if(id) {
-		if(id->flag & LIB_FAKEUSER) {
-			id_us_plus(id);
-		} else {
-			id->us--;
-		}
-	}
-}
-
 void brush_curve_preset(Brush *b, /*CurveMappingPreset*/int preset)
 {
 	CurveMap *cm = NULL;
@@ -524,12 +478,6 @@ int brush_clone_image_delete(Brush *brush)
 	return 0;
 }
 
-void brush_check_exists(Brush **brush, const char *name)
-{
-	if(*brush==NULL)
-		brush_set_nr(brush, 1, name);
-}
-
 /* Brush Sampling */
 void brush_sample_tex(Brush *brush, float *xy, float *rgba)
 {
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index b58e6c459ff..3343df6b8a7 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -71,91 +71,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)
@@ -169,7 +91,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);
@@ -180,28 +103,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]);
-	}
-}
-
-int paint_has_brush(Paint *p, Brush *brush)
-{
-	int i;
-
-	for (i= 0; i < p->brush_count; i++) {
-		if (strcmp(brush->id.name+2, p->brushes[i]->id.name+2) == 0) 
-			return 1;
-	}
-
-	return 0;
+	tar->brush= src->brush;
 }