Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / source / blender / blenkernel / intern / paint.c
index 7c5b2b8..80016f2 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-const char PAINT_CURSOR_SCULPT[3] = {255, 100, 100};
-const char PAINT_CURSOR_VERTEX_PAINT[3] = {255, 255, 255};
-const char PAINT_CURSOR_WEIGHT_PAINT[3] = {200, 200, 255};
-const char PAINT_CURSOR_TEXTURE_PAINT[3] = {255, 255, 255};
-
 Paint *paint_get_active(Scene *sce)
 {
        if(sce && sce->basact && sce->basact->object) {
@@ -159,17 +154,14 @@ int paint_facesel_test(Object *ob)
 
 }
 
-void paint_init(Paint *p, const char col[3])
+void paint_init(Paint *p, const char *name)
 {
        Brush *brush;
 
        /* If there's no brush, create one */
        brush = paint_brush(p);
-       brush_check_exists(&brush, "Brush");
+       brush_check_exists(&brush, name);
        paint_brush_set(p, brush);
-
-       memcpy(p->paint_cursor_col, col, 3);
-       p->paint_cursor_col[3] = 128;
 }
 
 void free_paint(Paint *paint)