diff options
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 36 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 2 |
2 files changed, 1 insertions, 37 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 52eb080210a..419fe961cec 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -883,23 +883,19 @@ DEF_ICON(VIEW_ZOOM) /* brush icons */ -DEF_ICON_COLOR(BRUSH_ADD) DEF_ICON_COLOR(BRUSH_BLOB) DEF_ICON_COLOR(BRUSH_BLUR) DEF_ICON_COLOR(BRUSH_CLAY) DEF_ICON_COLOR(BRUSH_CLAY_STRIPS) DEF_ICON_COLOR(BRUSH_CLONE) DEF_ICON_COLOR(BRUSH_CREASE) -DEF_ICON_COLOR(BRUSH_DARKEN) DEF_ICON_COLOR(BRUSH_FILL) DEF_ICON_COLOR(BRUSH_FLATTEN) DEF_ICON_COLOR(BRUSH_GRAB) DEF_ICON_COLOR(BRUSH_INFLATE) DEF_ICON_COLOR(BRUSH_LAYER) -DEF_ICON_COLOR(BRUSH_LIGHTEN) DEF_ICON_COLOR(BRUSH_MASK) DEF_ICON_COLOR(BRUSH_MIX) -DEF_ICON_COLOR(BRUSH_MULTIPLY) DEF_ICON_COLOR(BRUSH_NUDGE) DEF_ICON_COLOR(BRUSH_PINCH) DEF_ICON_COLOR(BRUSH_SCRAPE) @@ -908,39 +904,11 @@ DEF_ICON_COLOR(BRUSH_SMEAR) DEF_ICON_COLOR(BRUSH_SMOOTH) DEF_ICON_COLOR(BRUSH_SNAKE_HOOK) DEF_ICON_COLOR(BRUSH_SOFTEN) -DEF_ICON_COLOR(BRUSH_SUBTRACT) DEF_ICON_COLOR(BRUSH_TEXDRAW) DEF_ICON_COLOR(BRUSH_TEXFILL) DEF_ICON_COLOR(BRUSH_TEXMASK) DEF_ICON_COLOR(BRUSH_THUMB) DEF_ICON_COLOR(BRUSH_ROTATE) -DEF_ICON_COLOR(BRUSH_VERTEXDRAW) - - /* Matcaps */ -DEF_ICON_COLOR(MATCAP_01) -DEF_ICON_COLOR(MATCAP_02) -DEF_ICON_COLOR(MATCAP_03) -DEF_ICON_COLOR(MATCAP_04) -DEF_ICON_COLOR(MATCAP_05) -DEF_ICON_COLOR(MATCAP_06) -DEF_ICON_COLOR(MATCAP_07) -DEF_ICON_COLOR(MATCAP_08) -DEF_ICON_COLOR(MATCAP_09) -DEF_ICON_COLOR(MATCAP_10) -DEF_ICON_COLOR(MATCAP_11) -DEF_ICON_COLOR(MATCAP_12) -DEF_ICON_COLOR(MATCAP_13) -DEF_ICON_COLOR(MATCAP_14) -DEF_ICON_COLOR(MATCAP_15) -DEF_ICON_COLOR(MATCAP_16) -DEF_ICON_COLOR(MATCAP_17) -DEF_ICON_COLOR(MATCAP_18) -DEF_ICON_COLOR(MATCAP_19) -DEF_ICON_COLOR(MATCAP_20) -DEF_ICON_COLOR(MATCAP_21) -DEF_ICON_COLOR(MATCAP_22) -DEF_ICON_COLOR(MATCAP_23) -DEF_ICON_COLOR(MATCAP_24) /* grease pencil sculpt */ DEF_ICON_COLOR(GPBRUSH_SMOOTH) @@ -953,14 +921,12 @@ DEF_ICON_COLOR(GPBRUSH_PINCH) DEF_ICON_COLOR(GPBRUSH_RANDOMIZE) DEF_ICON_COLOR(GPBRUSH_CLONE) DEF_ICON_COLOR(GPBRUSH_WEIGHT) - DEF_ICON_COLOR(GPBRUSH_PENCIL) DEF_ICON_COLOR(GPBRUSH_PEN) DEF_ICON_COLOR(GPBRUSH_INK) DEF_ICON_COLOR(GPBRUSH_INKNOISE) DEF_ICON_COLOR(GPBRUSH_BLOCK) DEF_ICON_COLOR(GPBRUSH_MARKER) -DEF_ICON_COLOR(GPBRUSH_CUSTOM) DEF_ICON_COLOR(GPBRUSH_FILL) DEF_ICON_COLOR(GPBRUSH_ERASE_SOFT) DEF_ICON_COLOR(GPBRUSH_ERASE_HARD) @@ -1049,8 +1015,6 @@ DEF_ICON_COLOR(EVENT_ESC) DEF_ICON_COLOR(EVENT_TAB) DEF_ICON_COLOR(EVENT_PAGEUP) DEF_ICON_COLOR(EVENT_PAGEDOWN) -DEF_ICON_COLOR(EVENT_HOME) -DEF_ICON_COLOR(EVENT_END) DEF_ICON_COLOR(EVENT_RETURN) /* add as needed. */ diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 0e4f0553a0c..a5f43a580c5 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -80,7 +80,7 @@ const EnumPropertyItem rna_enum_brush_sculpt_tool_items[] = { {SCULPT_TOOL_ROTATE, "ROTATE", ICON_BRUSH_ROTATE, "Rotate", ""}, {0, "", 0, NULL, NULL}, {SCULPT_TOOL_MASK, "MASK", ICON_BRUSH_MASK, "Mask", ""}, - {SCULPT_TOOL_SIMPLIFY, "SIMPLIFY", ICON_BRUSH_SUBTRACT /* icon TODO */, "Simplify", ""}, + {SCULPT_TOOL_SIMPLIFY, "SIMPLIFY", ICON_BRUSH_DATA /* icon TODO */, "Simplify", ""}, {0, NULL, 0, NULL, NULL}, }; |