blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix T60199: Icon Viewer addon causes internal errors and slows text editor 

this just removes unused icon definitions [for which no icons exist
anymore]

Reviewers: billreynish, brecht

Maniphest Tasks: T60199

Differential Revision: https://developer.blender.org/D4628
This commit is contained in:
Philipp Oeser 2019-03-29 16:10:36 +01:00
parent 6470056a0d
commit 0df17bc9c9
Notes: blender-bot 2023-02-14 19:22:08 +01:00 
Referenced by issue #62527, Broken/Missing Icons
Referenced by issue blender/blender-addons#60199, Icon Viewer addon causes internal errors and slows text editor.
2 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source/blender/editors/include/UI_icons.h
View File

@ -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. */

2
source/blender/makesrna/intern/rna_brush.c
View File

@ -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},
};