diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-21 10:23:38 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-21 10:23:38 +0400 |
| commit | 589ea76833778a37fe0ec93cc28de1102d9793b5 (patch) | |
| tree | 2d82c0a6745743844db529cc9720a415a649678a /source/blender | |
| parent | 5cd51b4387f262fbc2b5de18e9f4b9d02f5d4ca6 (diff) | |
2.5/Paint:
* Updated texture paint UI for stroke settings.
* Removed duplicate brush blend types, just use the ones defined in imbuf instead
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_brush_types.h | 10 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 18 |
3 files changed, 11 insertions, 19 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 2dcd7a64947..afd8336c2a9 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -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; diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 52ea298c110..a3a1a342584 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -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 diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 03b5a44f52b..9c453ac44df 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -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"); |