2.5/Paint:
authorNicholas Bishop <nicholasbishop@gmail.com>
Fri, 21 Aug 2009 06:23:38 +0000 (06:23 +0000)
committerNicholas Bishop <nicholasbishop@gmail.com>
Fri, 21 Aug 2009 06:23:38 +0000 (06:23 +0000)
* Updated texture paint UI for stroke settings.
* Removed duplicate brush blend types, just use the ones defined in imbuf instead

release/ui/space_view3d_toolbar.py
source/blender/editors/sculpt_paint/paint_image.c
source/blender/makesdna/DNA_brush_types.h
source/blender/makesrna/intern/rna_brush.c

index 35df4dc8b54570065fa4d00583fe9000df49ffd7..d0f07c70657bd13a00412030c3ea962ed9faa82b 100644 (file)
@@ -369,7 +369,7 @@ class VIEW3D_PT_tools_brush(PaintPanel):
                                
                        col = layout.column()
                        col.itemR(brush, "color", text="")
-                               
+
                        row = col.row(align=True)
                        row.itemR(brush, "size", slider=True)
                        row.itemR(brush, "size_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
@@ -382,18 +382,7 @@ class VIEW3D_PT_tools_brush(PaintPanel):
                        row.itemR(brush, "falloff", slider=True)
                        row.itemR(brush, "falloff_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
                        
-                       row = col.row(align=True)
-                       row.itemR(brush, "space", text="")
-                       rowsub = row.row(align=True)
-                       rowsub.active = brush.space
-                       rowsub.itemR(brush, "spacing", text="Spacing", slider=True)
-                       rowsub.itemR(brush, "spacing_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
-                       
-                       col = layout.column()
-                       col.itemR(brush, "airbrush")
-                       sub = col.column()
-                       sub.active = brush.airbrush
-                       sub.itemR(brush, "rate")
+                       col.itemR(brush, "blend")
                
                # Weight Paint Mode #
        
@@ -431,23 +420,28 @@ class VIEW3D_PT_tools_brush_stroke(PaintPanel):
                settings = self.paint_settings(context)
                return (settings and settings.brush and (context.sculpt_object or
                                                         context.vertex_paint_object or
-                                                        context.weight_paint_object))
+                                                        context.weight_paint_object or
+                                                        context.texture_paint_object))
 
        def draw(self, context):
                settings = self.paint_settings(context)
                brush = settings.brush
+               texture_paint = context.texture_paint_object
                layout = self.layout
 
-               layout.itemR(brush, "smooth_stroke")
-               col = layout.column()
-               col.active = brush.smooth_stroke
-               col.itemR(brush, "smooth_stroke_radius", text="Radius", slider=True)
-               col.itemR(brush, "smooth_stroke_factor", text="Factor", slider=True)
+               if not texture_paint:
+                       layout.itemR(brush, "smooth_stroke")
+                       col = layout.column()
+                       col.active = brush.smooth_stroke
+                       col.itemR(brush, "smooth_stroke_radius", text="Radius", slider=True)
+                       col.itemR(brush, "smooth_stroke_factor", text="Factor", slider=True)
 
                layout.itemR(brush, "space")
-               col = layout.column()
-               col.active = brush.space
-               col.itemR(brush, "spacing", text="Distance", slider=True)
+               row = layout.row(align=True)
+               row.active = brush.space
+               row.itemR(brush, "spacing", text="Distance", slider=True)
+               if texture_paint:
+                       row.itemR(brush, "spacing_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
 
                layout.itemR(brush, "airbrush")
                col = layout.column()
index 2dcd7a6494717ba4e4fa55007e575ec2a62f5c45..afd8336c2a9e5f90046070823e4a9f02a346441e 100644 (file)
@@ -4719,7 +4719,7 @@ static void paint_apply_event(bContext *C, wmOperator *op, wmEvent *event)
                tablet= (wmtab->Active != EVT_TABLET_NONE);
                pressure= wmtab->Pressure;
                if(wmtab->Active == EVT_TABLET_ERASER)
-                       pop->s.blend= BRUSH_BLEND_ERASE_ALPHA;
+                       pop->s.blend= IMB_BLEND_ERASE_ALPHA;
        }
        else
                pressure= 1.0f;
index 52ea298c110a2c3bc1e27c707747a6fdeb3d630f..a3a1a342584222e029375f1bfa71bd26d4f4717a 100644 (file)
@@ -86,16 +86,6 @@ typedef struct Brush {
 #define BRUSH_SMOOTH_STROKE    2048
 #define BRUSH_PERSISTENT       4096
 
-/* Brush.blend */
-#define BRUSH_BLEND_MIX                0
-#define BRUSH_BLEND_ADD                1
-#define BRUSH_BLEND_SUB                2
-#define BRUSH_BLEND_MUL                3
-#define BRUSH_BLEND_LIGHTEN            4
-#define BRUSH_BLEND_DARKEN             5
-#define BRUSH_BLEND_ERASE_ALPHA        6
-#define BRUSH_BLEND_ADD_ALPHA  7
-
 /* Brush.sculpt_tool */
 #define SCULPT_TOOL_DRAW    1
 #define SCULPT_TOOL_SMOOTH  2
index 03b5a44f52b99e7fd5c94de52dd8c1748f4addfb..9c453ac44df469cd2e7f9412ab17c4487f4f8ad6 100644 (file)
@@ -32,6 +32,8 @@
 #include "DNA_brush_types.h"
 #include "DNA_texture_types.h"
 
+#include "IMB_imbuf.h"
+
 EnumPropertyItem brush_sculpt_tool_items[] = {
        {SCULPT_TOOL_DRAW, "DRAW", 0, "Draw", ""},
        {SCULPT_TOOL_SMOOTH, "SMOOTH", 0, "Smooth", ""},
@@ -93,14 +95,14 @@ void rna_def_brush(BlenderRNA *brna)
        PropertyRNA *prop;
        
        static EnumPropertyItem prop_blend_items[] = {
-               {BRUSH_BLEND_MIX, "MIX", 0, "Mix", "Use mix blending mode while painting."},
-               {BRUSH_BLEND_ADD, "ADD", 0, "Add", "Use add blending mode while painting."},
-               {BRUSH_BLEND_SUB, "SUB", 0, "Subtract", "Use subtract blending mode while painting."},
-               {BRUSH_BLEND_MUL, "MUL", 0, "Multiply", "Use multiply blending mode while painting."},
-               {BRUSH_BLEND_LIGHTEN, "LIGHTEN", 0, "Lighten", "Use lighten blending mode while painting."},
-               {BRUSH_BLEND_DARKEN, "DARKEN", 0, "Darken", "Use darken blending mode while painting."},
-               {BRUSH_BLEND_ERASE_ALPHA, "ERASE_ALPHA", 0, "Erase Alpha", "Erase alpha while painting."},
-               {BRUSH_BLEND_ADD_ALPHA, "ADD_ALPHA", 0, "Add Alpha", "Add alpha while painting."},
+               {IMB_BLEND_MIX, "MIX", 0, "Mix", "Use mix blending mode while painting."},
+               {IMB_BLEND_ADD, "ADD", 0, "Add", "Use add blending mode while painting."},
+               {IMB_BLEND_SUB, "SUB", 0, "Subtract", "Use subtract blending mode while painting."},
+               {IMB_BLEND_MUL, "MUL", 0, "Multiply", "Use multiply blending mode while painting."},
+               {IMB_BLEND_LIGHTEN, "LIGHTEN", 0, "Lighten", "Use lighten blending mode while painting."},
+               {IMB_BLEND_DARKEN, "DARKEN", 0, "Darken", "Use darken blending mode while painting."},
+               {IMB_BLEND_ERASE_ALPHA, "ERASE_ALPHA", 0, "Erase Alpha", "Erase alpha while painting."},
+               {IMB_BLEND_ADD_ALPHA, "ADD_ALPHA", 0, "Add Alpha", "Add alpha while painting."},
                {0, NULL, 0, NULL, NULL}};
                
        srna= RNA_def_struct(brna, "Brush", "ID");