Moved the image paint tool and the vertex/weight paint tool (blend mode?)

to the Brush data. This now works the same way as sculpt, with named 
preset brushes that retain settings.

1 files changed, 2 insertions, 26 deletions

diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 5d81ec2c572..462ba5c256f 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -277,23 +277,10 @@ static void rna_def_vertex_paint(BlenderRNA *brna)
 {
 	StructRNA *srna;
 	PropertyRNA *prop;
-	static EnumPropertyItem brush_mode_items[] = {
-		{0, "MIX", 0, "Mix", "Use mix blending mode while painting."},
-		{1, "ADD", 0, "Add", "Use add blending mode while painting."},
-		{2, "SUB", 0, "Subtract", "Use subtract blending mode while painting."},
-		{3, "MUL", 0, "Multiply", "Use multiply blending mode while painting."},
-		{4, "BLUR", 0, "Blur", "Blur the color with surrounding values"},
-		{5, "LIGHTEN", 0, "Lighten", "Use lighten blending mode while painting."},
-		{6, "DARKEN", 0, "Darken", "Use darken blending mode while painting."},
-		{0, NULL, 0, NULL, NULL}};
-	
+
 	srna= RNA_def_struct(brna, "VertexPaint", "Paint");
 	RNA_def_struct_sdna(srna, "VPaint");
 	RNA_def_struct_ui_text(srna, "Vertex Paint", "Properties of vertex and weight paint mode.");
-    
-	prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_items(prop, brush_mode_items);
-	RNA_def_property_ui_text(prop, "Brush Mode", "Mode in which color is painted.");
 	
 	prop= RNA_def_property(srna, "all_faces", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", VP_AREA);
@@ -312,22 +299,11 @@ static void rna_def_image_paint(BlenderRNA *brna)
 {
 	StructRNA *srna;
 	PropertyRNA *prop;
-
-	static EnumPropertyItem tool_items[] = {
-		{PAINT_TOOL_DRAW, "DRAW", 0, "Draw", ""},
-		{PAINT_TOOL_SOFTEN, "SOFTEN", 0, "Soften", ""},
-		{PAINT_TOOL_SMEAR, "SMEAR", 0, "Smear", ""},
-		{PAINT_TOOL_CLONE, "CLONE", 0, "Clone", ""},
-		{0, NULL, 0, NULL, NULL}};
 	
 	srna= RNA_def_struct(brna, "ImagePaint", "Paint");
 	RNA_def_struct_sdna(srna, "ImagePaintSettings");
 	RNA_def_struct_ui_text(srna, "Image Paint", "Properties of image and texture painting mode.");
- 
-	prop= RNA_def_property(srna, "tool", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_items(prop, tool_items);
-	RNA_def_property_ui_text(prop, "Tool", "");
-
+	
 	/* booleans */
 
 	prop= RNA_def_property(srna, "show_brush_draw", PROP_BOOLEAN, PROP_NONE);