diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-16 21:20:24 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-16 21:23:43 +0300 |
commit | 5134ed60d6ca4aa9ddaa8e6e0740bca5e995459a (patch) | |
tree | 57b79a661f7d923b3d0cf9614248103efad7c300 /source/blender/editors/include/UI_icons.h | |
parent | 569dfe5784aab59079589ef780d7826a9983b699 (diff) |
UI: icon set updates Andrzej Ambroz.
This adds and changes various icons, in particular modifier and force field
icons are now included.
Diffstat (limited to 'source/blender/editors/include/UI_icons.h')
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 137 |
1 files changed, 69 insertions, 68 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index a463cfdb633..5b6d39863f9 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -65,7 +65,7 @@ DEF_ICON(DISCLOSURE_TRI_RIGHT) DEF_ICON(DISCLOSURE_TRI_DOWN) DEF_ICON(RADIOBUT_OFF) DEF_ICON(RADIOBUT_ON) -DEF_ICON_COLOR(MENU_PANEL) +DEF_ICON(MENU_PANEL) DEF_ICON(BLENDER) DEF_ICON(GRIP) DEF_ICON(DOT) @@ -132,7 +132,7 @@ DEF_ICON(RECOVER_LAST) DEF_ICON(30) DEF_ICON(FULLSCREEN_ENTER) DEF_ICON(FULLSCREEN_EXIT) -DEF_ICON(ONIONSKIN) +DEF_ICON_BLANK(33) /* BUTTONS */ DEF_ICON_SHADING(LIGHT) @@ -192,7 +192,7 @@ DEF_ICON_BLANK(61) /* MODES */ DEF_ICON(OBJECT_DATAMODE) // XXX fix this up DEF_ICON(EDITMODE_HLT) -DEF_ICON(FACESEL_HLT) +DEF_ICON(UV) DEF_ICON(VPAINT_HLT) DEF_ICON(TPAINT_HLT) DEF_ICON(WPAINT_HLT) @@ -263,7 +263,7 @@ DEF_ICON(STRANDS) DEF_ICON(LIBRARY_DATA_INDIRECT) DEF_ICON(GREASEPENCIL) DEF_ICON_SHADING(LINE_DATA) -DEF_ICON_COLOR(LIBRARY_DATA_OVERRIDE) +DEF_ICON(LIBRARY_DATA_OVERRIDE) DEF_ICON(GROUP_BONE) DEF_ICON(GROUP_VERTEX) DEF_ICON(GROUP_VCOL) @@ -321,8 +321,8 @@ DEF_ICON_OBJECT(OUTLINER_OB_IMAGE) DEF_ICON_BLANK(125) DEF_ICON(RESTRICT_COLOR_OFF) DEF_ICON(RESTRICT_COLOR_ON) -DEF_ICON(RESTRICT_VIEW_OFF) -DEF_ICON(RESTRICT_VIEW_ON) +DEF_ICON(HIDE_OFF) +DEF_ICON(HIDE_ON) DEF_ICON(RESTRICT_SELECT_OFF) DEF_ICON(RESTRICT_SELECT_ON) DEF_ICON(RESTRICT_RENDER_OFF) @@ -344,17 +344,17 @@ DEF_ICON_OBJECT_DATA(OUTLINER_DATA_SPEAKER) DEF_ICON_OBJECT_DATA(OUTLINER_DATA_POSE) DEF_ICON_BLANK(130) DEF_ICON_OBJECT_DATA(OUTLINER_DATA_GREASEPENCIL) -DEF_ICON_BLANK(132) -DEF_ICON_BLANK(133) -DEF_ICON_BLANK(134) -DEF_ICON_BLANK(135) +DEF_ICON(GP_SELECT_POINTS) +DEF_ICON(GP_SELECT_STROKES) +DEF_ICON(GP_MULTIFRAME_EDITING) +DEF_ICON(GP_ONLY_SELECTED) DEF_ICON_BLANK(136) DEF_ICON_BLANK(137) DEF_ICON_BLANK(138) DEF_ICON(ONIONSKIN_OFF) DEF_ICON(ONIONSKIN_ON) -DEF_ICON(HIDE_OFF) -DEF_ICON(HIDE_ON) +DEF_ICON(RESTRICT_VIEW_OFF) +DEF_ICON(RESTRICT_VIEW_ON) DEF_ICON_BLANK(142b) /* PRIMITIVES */ @@ -392,8 +392,8 @@ DEF_ICON(SURFACE_NSURFACE) DEF_ICON(SURFACE_NCYLINDER) DEF_ICON(SURFACE_NSPHERE) DEF_ICON(SURFACE_NTORUS) -DEF_ICON_BLANK(636) -DEF_ICON_BLANK(637) +DEF_ICON(GP_EMPTY) +DEF_ICON(GP_STROKE) DEF_ICON_BLANK(638) DEF_ICON(CURVE_BEZCURVE) DEF_ICON(CURVE_BEZCIRCLE) @@ -414,19 +414,19 @@ DEF_ICON(TRIA_LEFT_BAR) DEF_ICON(TRIA_UP_BAR) /* EMPTY */ -DEF_ICON_COLOR(FORCE_FORCE) -DEF_ICON_COLOR(FORCE_WIND) -DEF_ICON_COLOR(FORCE_VORTEX) -DEF_ICON_COLOR(FORCE_MAGNETIC) -DEF_ICON_COLOR(FORCE_HARMONIC) -DEF_ICON_COLOR(FORCE_CHARGE) -DEF_ICON_COLOR(FORCE_LENNARDJONES) -DEF_ICON_COLOR(FORCE_TEXTURE) -DEF_ICON_COLOR(FORCE_CURVE) -DEF_ICON_COLOR(FORCE_BOID) -DEF_ICON_COLOR(FORCE_TURBULENCE) -DEF_ICON_COLOR(FORCE_DRAG) -DEF_ICON_COLOR(FORCE_SMOKEFLOW) +DEF_ICON(FORCE_FORCE) +DEF_ICON(FORCE_WIND) +DEF_ICON(FORCE_VORTEX) +DEF_ICON(FORCE_MAGNETIC) +DEF_ICON(FORCE_HARMONIC) +DEF_ICON(FORCE_CHARGE) +DEF_ICON(FORCE_LENNARDJONES) +DEF_ICON(FORCE_TEXTURE) +DEF_ICON(FORCE_CURVE) +DEF_ICON(FORCE_BOID) +DEF_ICON(FORCE_TURBULENCE) +DEF_ICON(FORCE_DRAG) +DEF_ICON(FORCE_SMOKEFLOW) DEF_ICON_BLANK(673) DEF_ICON_BLANK(674) DEF_ICON_BLANK(675) @@ -527,50 +527,50 @@ DEF_ICON_BLANK(785) /* MODIFIERS */ DEF_ICON_MODIFIER(MODIFIER) -DEF_ICON_COLOR(MOD_WAVE) -DEF_ICON_COLOR(MOD_BUILD) -DEF_ICON_COLOR(MOD_DECIM) -DEF_ICON_COLOR(MOD_MIRROR) -DEF_ICON_COLOR(MOD_SOFT) -DEF_ICON_COLOR(MOD_SUBSURF) -DEF_ICON_COLOR(HOOK) -DEF_ICON_COLOR(MOD_PHYSICS) -DEF_ICON_COLOR(MOD_PARTICLES) -DEF_ICON_COLOR(MOD_BOOLEAN) -DEF_ICON_COLOR(MOD_EDGESPLIT) -DEF_ICON_COLOR(MOD_ARRAY) -DEF_ICON_COLOR(MOD_UVPROJECT) -DEF_ICON_COLOR(MOD_DISPLACE) -DEF_ICON_COLOR(MOD_CURVE) -DEF_ICON_COLOR(MOD_LATTICE) +DEF_ICON_MODIFIER(MOD_WAVE) +DEF_ICON_MODIFIER(MOD_BUILD) +DEF_ICON_MODIFIER(MOD_DECIM) +DEF_ICON_MODIFIER(MOD_MIRROR) +DEF_ICON_MODIFIER(MOD_SOFT) +DEF_ICON_MODIFIER(MOD_SUBSURF) +DEF_ICON_MODIFIER(HOOK) +DEF_ICON_MODIFIER(MOD_PHYSICS) +DEF_ICON_MODIFIER(MOD_PARTICLES) +DEF_ICON_MODIFIER(MOD_BOOLEAN) +DEF_ICON_MODIFIER(MOD_EDGESPLIT) +DEF_ICON_MODIFIER(MOD_ARRAY) +DEF_ICON_MODIFIER(MOD_UVPROJECT) +DEF_ICON_MODIFIER(MOD_DISPLACE) +DEF_ICON_MODIFIER(MOD_CURVE) +DEF_ICON_MODIFIER(MOD_LATTICE) DEF_ICON_COLOR(CONSTRAINT_DATA) -DEF_ICON_COLOR(MOD_ARMATURE) -DEF_ICON_COLOR(MOD_SHRINKWRAP) -DEF_ICON_COLOR(MOD_CAST) -DEF_ICON_COLOR(MOD_MESHDEFORM) -DEF_ICON_COLOR(MOD_BEVEL) -DEF_ICON_COLOR(MOD_SMOOTH) -DEF_ICON_COLOR(MOD_SIMPLEDEFORM) -DEF_ICON_COLOR(MOD_MASK) +DEF_ICON_MODIFIER(MOD_ARMATURE) +DEF_ICON_MODIFIER(MOD_SHRINKWRAP) +DEF_ICON_MODIFIER(MOD_CAST) +DEF_ICON_MODIFIER(MOD_MESHDEFORM) +DEF_ICON_MODIFIER(MOD_BEVEL) +DEF_ICON_MODIFIER(MOD_SMOOTH) +DEF_ICON_MODIFIER(MOD_SIMPLEDEFORM) +DEF_ICON_MODIFIER(MOD_MASK) /* MODIFIERS */ -DEF_ICON_COLOR(MOD_CLOTH) -DEF_ICON_COLOR(MOD_EXPLODE) -DEF_ICON_COLOR(MOD_FLUIDSIM) -DEF_ICON_COLOR(MOD_MULTIRES) -DEF_ICON_COLOR(MOD_SMOKE) -DEF_ICON_COLOR(MOD_SOLIDIFY) -DEF_ICON_COLOR(MOD_SCREW) -DEF_ICON_COLOR(MOD_VERTEX_WEIGHT) -DEF_ICON_COLOR(MOD_DYNAMICPAINT) -DEF_ICON_COLOR(MOD_REMESH) -DEF_ICON_COLOR(MOD_OCEAN) -DEF_ICON_COLOR(MOD_WARP) -DEF_ICON_COLOR(MOD_SKIN) -DEF_ICON_COLOR(MOD_TRIANGULATE) -DEF_ICON_COLOR(MOD_WIREFRAME) -DEF_ICON_COLOR(MOD_DATA_TRANSFER) -DEF_ICON_COLOR(MOD_NORMALEDIT) +DEF_ICON_MODIFIER(MOD_CLOTH) +DEF_ICON_MODIFIER(MOD_EXPLODE) +DEF_ICON_MODIFIER(MOD_FLUIDSIM) +DEF_ICON_MODIFIER(MOD_MULTIRES) +DEF_ICON_MODIFIER(MOD_SMOKE) +DEF_ICON_MODIFIER(MOD_SOLIDIFY) +DEF_ICON_MODIFIER(MOD_SCREW) +DEF_ICON_MODIFIER(MOD_VERTEX_WEIGHT) +DEF_ICON_MODIFIER(MOD_DYNAMICPAINT) +DEF_ICON_MODIFIER(MOD_REMESH) +DEF_ICON_MODIFIER(MOD_OCEAN) +DEF_ICON_MODIFIER(MOD_WARP) +DEF_ICON_MODIFIER(MOD_SKIN) +DEF_ICON_MODIFIER(MOD_TRIANGULATE) +DEF_ICON_MODIFIER(MOD_WIREFRAME) +DEF_ICON_MODIFIER(MOD_DATA_TRANSFER) +DEF_ICON_MODIFIER(MOD_NORMALEDIT) DEF_ICON_BLANK(169) DEF_ICON_BLANK(170) DEF_ICON_BLANK(171) @@ -1058,6 +1058,7 @@ DEF_ICON_COLOR(EVENT_RETURN) /* Undefine all types. */ #undef DEF_ICON +#undef DEF_ICON_ERROR #undef DEF_ICON_COLLECTION #undef DEF_ICON_OBJECT #undef DEF_ICON_OBJECT_DATA |