Revision: 37348
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37348
Author: jwilkins
Date: 2011-06-09 22:57:15 +0000 (Thu, 09 Jun 2011)
Log Message:
-----------
vpaint merge mistakes
Some declarations had moved since the original and I ended up duplicating them.
Modified Paths:
--------------
branches/soc-2011-onion/source/blender/makesrna/intern/rna_brush.c
Modified: branches/soc-2011-onion/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- branches/soc-2011-onion/source/blender/makesrna/intern/rna_brush.c
2011-06-09 22:25:53 UTC (rev 37347)
+++ branches/soc-2011-onion/source/blender/makesrna/intern/rna_brush.c
2011-06-09 22:57:15 UTC (rev 37348)
@@ -78,17 +78,18 @@
{SCULPT_TOOL_MASK, "MASK", ICON_BRUSH_SUBTRACT, "Mask", ""},
{0, NULL, 0, NULL, NULL}};
-
EnumPropertyItem brush_vertex_tool_items[] = {
- {0, "MIX", ICON_BRUSH_MIX, "Mix", "Use mix blending mode while
painting"},
- {1, "ADD", ICON_BRUSH_ADD, "Add", "Use add blending mode while
painting"},
- {2, "SUB", ICON_BRUSH_SUBTRACT, "Subtract", "Use subtract blending mode
while painting"},
- {3, "MUL", ICON_BRUSH_MULTIPLY, "Multiply", "Use multiply blending mode
while painting"},
- {4, "BLUR", ICON_BRUSH_BLUR, "Blur", "Blur the color with surrounding
values"},
- {5, "LIGHTEN", ICON_BRUSH_LIGHTEN, "Lighten", "Use lighten blending
mode while painting"},
- {6, "DARKEN", ICON_BRUSH_DARKEN, "Darken", "Use darken blending mode
while painting"},
+ {IMB_BLEND_MIX, "MIX", ICON_BRUSH_MIX, "Mix", "Use mix blending mode
while painting"},
+ {IMB_BLEND_ADD, "ADD", ICON_BRUSH_ADD, "Add", "Use add blending mode
while painting"},
+ {IMB_BLEND_SUB, "SUB", ICON_BRUSH_SUBTRACT, "Subtract", "Use subtract
blending mode while painting"},
+ {IMB_BLEND_MUL, "MUL", ICON_BRUSH_MULTIPLY, "Multiply", "Use multiply
blending mode while painting"},
+ {IMB_BLEND_LIGHTEN, "LIGHTEN", ICON_BRUSH_LIGHTEN, "Lighten", "Use
lighten blending mode while painting"},
+ {IMB_BLEND_DARKEN, "DARKEN", ICON_BRUSH_DARKEN, "Darken", "Use darken
blending mode while painting"},
+ {IMB_BLEND_ERASE_ALPHA, "ERASE_ALPHA", 0, "Erase Alpha", "Use erase
alpha blending mode while painting"},
+ {IMB_BLEND_ADD_ALPHA, "ADD_ALPHA", 0, "Add Alpha", "Use add alpha
blending mode while painting"},
+ {VERTEX_PAINT_BLUR, "BLUR", ICON_BRUSH_BLUR, "Blur", "Blur the color
with surrounding values"},
{0, NULL, 0, NULL, NULL}};
-
+
EnumPropertyItem brush_image_tool_items[] = {
{PAINT_TOOL_DRAW, "DRAW", ICON_BRUSH_TEXDRAW, "Draw", ""},
{PAINT_TOOL_SOFTEN, "SOFTEN", ICON_BRUSH_SOFTEN, "Soften", ""},
@@ -409,66 +410,6 @@
{BRUSH_AIRBRUSH, "AIRBRUSH", 0, "Airbrush", "Keep applying
paint effect while holding mouse (spray)"},
{0, NULL, 0, NULL, NULL}};
- static EnumPropertyItem texture_angle_source_items[] = {
- {0, "USER", 0, "User", ""},
- {BRUSH_RAKE, "RAKE", 0, "Rake", ""},
- {BRUSH_RANDOM_ROTATION, "RANDOM", 0, "Random", ""},
- {0, NULL, 0, NULL, NULL}};
-
- static EnumPropertyItem texture_angle_source_no_random_items[] = {
- {0, "USER", 0, "User", ""},
- {BRUSH_RAKE, "RAKE", 0, "Rake", ""},
- {0, NULL, 0, NULL, NULL}};
-
- static EnumPropertyItem brush_vertexpaint_tool_items[] = {
- {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", "Use
erase alpha blending mode while painting"},
- {IMB_BLEND_ADD_ALPHA, "ADD_ALPHA", 0, "Add Alpha", "Use add
alpha blending mode while painting"},
- {VERTEX_PAINT_BLUR, "BLUR", 0, "Blur", "Blur the color with
surrounding values"},
- {0, NULL, 0, NULL, NULL}};
-
- static EnumPropertyItem brush_imagepaint_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}};
-
- static const EnumPropertyItem prop_flip_direction_items[]= {
- {0, "ADD", 0, "Add", "Add effect of brush"},
- {BRUSH_DIR_IN, "SUBTRACT", 0, "Subtract", "Subtract effect of
brush"},
- {0, NULL, 0, NULL, NULL}};
-
- static const EnumPropertyItem prop_flatten_contrast_items[]= {
- {0, "FLATTEN", 0, "Flatten", "Add effect of brush"},
- {BRUSH_DIR_IN, "CONTRAST", 0, "Contrast", "Subtract effect of
brush"},
- {0, NULL, 0, NULL, NULL}};
-
- static const EnumPropertyItem prop_fill_deepen_items[]= {
- {0, "FILL", 0, "Fill", "Add effect of brush"},
- {BRUSH_DIR_IN, "DEEPEN", 0, "Deepen", "Subtract effect of
brush"},
- {0, NULL, 0, NULL, NULL}};
-
- static const EnumPropertyItem prop_scrape_peaks_items[]= {
- {0, "SCRAPE", 0, "Scrape", "Add effect of brush"},
- {BRUSH_DIR_IN, "PEAKS", 0, "Peaks", "Subtract effect of brush"},
- {0, NULL, 0, NULL, NULL}};
-
- static const EnumPropertyItem prop_pinch_magnify_items[]= {
- {0, "PINCH", 0, "Pinch", "Add effect of brush"},
- {BRUSH_DIR_IN, "MAGNIFY", 0, "Magnify", "Subtract effect of
brush"},
- {0, NULL, 0, NULL, NULL}};
-
- static const EnumPropertyItem prop_inflate_deflate_items[]= {
- {0, "INFLATE", 0, "Inflate", "Add effect of brush"},
- {BRUSH_DIR_IN, "DEFLATE", 0, "Deflate", "Subtract effect of
brush"},
- {0, NULL, 0, NULL, NULL}};
-
static EnumPropertyItem brush_sculpt_plane_items[] = {
{SCULPT_DISP_DIR_AREA, "AREA", 0, "Area Plane", ""},
{SCULPT_DISP_DIR_VIEW, "VIEW", 0, "View Plane", ""},
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
