diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-20 19:07:58 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-20 20:15:41 +0300 |
commit | 1a0181bb6d94252fb4e4873eca8cdedc69c348be (patch) | |
tree | 6f9de01cd421092cf883bc29255bf05ce2ac51fc /source | |
parent | decc323b4e843c711554ebae632385d52caca113 (diff) |
UI: add support for defining any icon as a mono icon.
Previously it was hardcoded to one row. These icons are colored with the
text color. Changes include some refactoring.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 674 | ||||
-rw-r--r-- | source/blender/editors/include/UI_resources.h | 8 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_icons.c | 121 | ||||
-rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_graph/graph_buttons.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_buttons.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/RNA_enum_types.h | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_fcurve.c | 10 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 14 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_pose.c | 40 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_ui_api.c | 10 |
11 files changed, 412 insertions, 472 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 5601beb9228..2f69b48589f 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -53,9 +53,7 @@ DEF_ICON(GRIP) DEF_ICON(DOT) DEF_ICON(COLLAPSEMENU) DEF_ICON(X) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK005) /* XXX 'DOWNARROW' icon! */ -#endif +DEF_ICON_BLANK(5) /* XXX 'DOWNARROW' icon! */ DEF_ICON(GO_LEFT) DEF_ICON(PLUG) DEF_ICON(UI) @@ -113,9 +111,7 @@ DEF_ICON(FILE_TICK) DEF_ICON(QUIT) DEF_ICON(URL) DEF_ICON(RECOVER_LAST) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK030) -#endif +DEF_ICON_BLANK(30) DEF_ICON(FULLSCREEN_ENTER) DEF_ICON(FULLSCREEN_EXIT) DEF_ICON(BLANK1) // Not actually blank - this is used all over the place @@ -137,18 +133,16 @@ DEF_ICON(SPEAKER) DEF_ICON(TEXTURE_SHADED) DEF_ICON(TOOL_SETTINGS) DEF_ICON(SHADERFX) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK044) - DEF_ICON(BLANK045) - DEF_ICON(BLANK046) - DEF_ICON(BLANK047) - DEF_ICON(BLANK048) - DEF_ICON(BLANK049) - DEF_ICON(BLANK050) - DEF_ICON(BLANK051) - DEF_ICON(BLANK052) - DEF_ICON(BLANK052b) -#endif +DEF_ICON_BLANK(44) +DEF_ICON_BLANK(45) +DEF_ICON_BLANK(46) +DEF_ICON_BLANK(47) +DEF_ICON_BLANK(48) +DEF_ICON_BLANK(49) +DEF_ICON_BLANK(50) +DEF_ICON_BLANK(51) +DEF_ICON_BLANK(52) +DEF_ICON_BLANK(52b) /* EDITORS */ DEF_ICON(VIEW3D) DEF_ICON(IPO) @@ -171,13 +165,11 @@ DEF_ICON(CONSOLE) DEF_ICON(PREFERENCES) DEF_ICON(CLIP) DEF_ICON(ASSET_MANAGER) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK057) - DEF_ICON(BLANK058) - DEF_ICON(BLANK059) - DEF_ICON(BLANK060) - DEF_ICON(BLANK061) -#endif +DEF_ICON_BLANK(57) +DEF_ICON_BLANK(58) +DEF_ICON_BLANK(59) +DEF_ICON_BLANK(60) +DEF_ICON_BLANK(61) /* MODES */ DEF_ICON(OBJECT_DATAMODE) // XXX fix this up @@ -191,23 +183,21 @@ DEF_ICON(POSE_HLT) DEF_ICON(PARTICLEMODE) DEF_ICON(LIGHTPAINT) DEF_ICON(GREASEPENCIL_STROKE_PAINT) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK064) - DEF_ICON(BLANK065) - DEF_ICON(BLANK066) - DEF_ICON(BLANK067) - DEF_ICON(BLANK068) - DEF_ICON(BLANK069) - DEF_ICON(BLANK070) - DEF_ICON(BLANK071) - DEF_ICON(BLANK072) - DEF_ICON(BLANK073) - DEF_ICON(BLANK074) - DEF_ICON(BLANK075) - DEF_ICON(BLANK076) - DEF_ICON(BLANK077) - DEF_ICON(BLANK077b) -#endif +DEF_ICON_BLANK(64) +DEF_ICON_BLANK(65) +DEF_ICON_BLANK(66) +DEF_ICON_BLANK(67) +DEF_ICON_BLANK(68) +DEF_ICON_BLANK(69) +DEF_ICON_BLANK(70) +DEF_ICON_BLANK(71) +DEF_ICON_BLANK(72) +DEF_ICON_BLANK(73) +DEF_ICON_BLANK(74) +DEF_ICON_BLANK(75) +DEF_ICON_BLANK(76) +DEF_ICON_BLANK(77) +DEF_ICON_BLANK(77b) /* DATA */ DEF_ICON(SCENE_DATA) @@ -235,9 +225,7 @@ DEF_ICON(CONSTRAINT_BONE) DEF_ICON(CAMERA_STEREO) DEF_ICON(PACKAGE) DEF_ICON(UGLYPACKAGE) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK079b) -#endif +DEF_ICON_BLANK(79b) /* DATA */ DEF_ICON(BRUSH_DATA) @@ -262,46 +250,38 @@ DEF_ICON(GROUP_BONE) DEF_ICON(GROUP_VERTEX) DEF_ICON(GROUP_VCOL) DEF_ICON(GROUP_UVS) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK089) - DEF_ICON(BLANK090) -#endif +DEF_ICON_BLANK(89) +DEF_ICON_BLANK(90) DEF_ICON(RNA) DEF_ICON(RNA_ADD) - /* MONOCHROME ICONS */ -DEF_ICON(MOUSE_LMB) -DEF_ICON(MOUSE_MMB) -DEF_ICON(MOUSE_RMB) -DEF_ICON(MOUSE_MOVE) -DEF_ICON(MOUSE_LMB_DRAG) -DEF_ICON(MOUSE_MMB_DRAG) -DEF_ICON(MOUSE_RMB_DRAG) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK099) -#endif -DEF_ICON(PRESET) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK101) -#endif -DEF_ICON(DECORATE) -DEF_ICON(DECORATE_KEYFRAME) -DEF_ICON(DECORATE_ANIMATE) -DEF_ICON(DECORATE_DRIVER) -DEF_ICON(DECORATE_LINKED) -DEF_ICON(DECORATE_OVERRIDE) -DEF_ICON(DECORATE_UNLOCKED) -DEF_ICON(DECORATE_LOCKED) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK110) - DEF_ICON(BLANK111) - DEF_ICON(BLANK112) - DEF_ICON(BLANK113) - DEF_ICON(BLANK114) - DEF_ICON(BLANK115) - DEF_ICON(BLANK116) - DEF_ICON(BLANK116b) -#endif + /* INPUT + DECORATOR */ +DEF_ICON_MONO(MOUSE_LMB) +DEF_ICON_MONO(MOUSE_MMB) +DEF_ICON_MONO(MOUSE_RMB) +DEF_ICON_MONO(MOUSE_MOVE) +DEF_ICON_MONO(MOUSE_LMB_DRAG) +DEF_ICON_MONO(MOUSE_MMB_DRAG) +DEF_ICON_MONO(MOUSE_RMB_DRAG) +DEF_ICON_BLANK(99) +DEF_ICON_MONO(PRESET) +DEF_ICON_BLANK(101) +DEF_ICON_MONO(DECORATE) +DEF_ICON_MONO(DECORATE_KEYFRAME) +DEF_ICON_MONO(DECORATE_ANIMATE) +DEF_ICON_MONO(DECORATE_DRIVER) +DEF_ICON_MONO(DECORATE_LINKED) +DEF_ICON_MONO(DECORATE_OVERRIDE) +DEF_ICON_MONO(DECORATE_UNLOCKED) +DEF_ICON_MONO(DECORATE_LOCKED) +DEF_ICON_BLANK(110) +DEF_ICON_BLANK(111) +DEF_ICON_BLANK(112) +DEF_ICON_BLANK(113) +DEF_ICON_BLANK(114) +DEF_ICON_BLANK(115) +DEF_ICON_BLANK(116) +DEF_ICON_BLANK(116b) /* OUTLINER */ DEF_ICON(OUTLINER_OB_EMPTY) @@ -319,10 +299,8 @@ DEF_ICON(OUTLINER_OB_FORCE_FIELD) DEF_ICON(OUTLINER_OB_GROUP_INSTANCE) DEF_ICON(OUTLINER_OB_GREASEPENCIL) DEF_ICON(OUTLINER_OB_LIGHTPROBE) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK124) - DEF_ICON(BLANK125) -#endif +DEF_ICON_BLANK(124) +DEF_ICON_BLANK(125) DEF_ICON(RESTRICT_COLOR_OFF) DEF_ICON(RESTRICT_COLOR_ON) DEF_ICON(HIDE_OFF) @@ -331,9 +309,7 @@ DEF_ICON(RESTRICT_SELECT_OFF) DEF_ICON(RESTRICT_SELECT_ON) DEF_ICON(RESTRICT_RENDER_OFF) DEF_ICON(RESTRICT_RENDER_ON) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK127b) -#endif +DEF_ICON_BLANK(127b) /* OUTLINER */ DEF_ICON(OUTLINER_DATA_EMPTY) @@ -349,23 +325,19 @@ DEF_ICON(OUTLINER_DATA_SURFACE) DEF_ICON(OUTLINER_DATA_SPEAKER) DEF_ICON(OUTLINER_DATA_POSE) DEF_ICON(OUTLINER_DATA_GREASEPENCIL) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK131) - DEF_ICON(BLANK132) - DEF_ICON(BLANK133) - DEF_ICON(BLANK134) - DEF_ICON(BLANK135) - DEF_ICON(BLANK136) - DEF_ICON(BLANK137) - DEF_ICON(BLANK138) - DEF_ICON(BLANK139) - DEF_ICON(BLANK140) -#endif +DEF_ICON_BLANK(131) +DEF_ICON_BLANK(132) +DEF_ICON_BLANK(133) +DEF_ICON_BLANK(134) +DEF_ICON_BLANK(135) +DEF_ICON_BLANK(136) +DEF_ICON_BLANK(137) +DEF_ICON_BLANK(138) +DEF_ICON_BLANK(139) +DEF_ICON_BLANK(140) DEF_ICON(RESTRICT_VIEW_OFF) DEF_ICON(RESTRICT_VIEW_ON) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK142b) -#endif +DEF_ICON_BLANK(142b) /* PRIMITIVES */ DEF_ICON(MESH_PLANE) @@ -379,27 +351,21 @@ DEF_ICON(MESH_CYLINDER) DEF_ICON(MESH_TORUS) DEF_ICON(MESH_CONE) DEF_ICON(MESH_CAPSULE) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK611) -#endif +DEF_ICON_BLANK(611) DEF_ICON(LIGHT_POINT) DEF_ICON(LIGHT_SUN) DEF_ICON(LIGHT_SPOT) DEF_ICON(LIGHT_HEMI) DEF_ICON(LIGHT_AREA) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK617) - DEF_ICON(BLANK618) -#endif +DEF_ICON_BLANK(617) +DEF_ICON_BLANK(618) DEF_ICON(META_EMPTY) DEF_ICON(META_PLANE) DEF_ICON(META_CUBE) DEF_ICON(META_BALL) DEF_ICON(META_ELLIPSOID) DEF_ICON(META_CAPSULE) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK625) -#endif +DEF_ICON_BLANK(625) /* PRIMITIVES */ DEF_ICON(SURFACE_NCURVE) @@ -408,11 +374,9 @@ DEF_ICON(SURFACE_NSURFACE) DEF_ICON(SURFACE_NCYLINDER) DEF_ICON(SURFACE_NSPHERE) DEF_ICON(SURFACE_NTORUS) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK636) - DEF_ICON(BLANK637) - DEF_ICON(BLANK638) -#endif +DEF_ICON_BLANK(636) +DEF_ICON_BLANK(637) +DEF_ICON_BLANK(638) DEF_ICON(CURVE_BEZCURVE) DEF_ICON(CURVE_BEZCIRCLE) DEF_ICON(CURVE_NCURVE) @@ -421,10 +385,8 @@ DEF_ICON(CURVE_PATH) DEF_ICON(LIGHTPROBE_CUBEMAP) DEF_ICON(LIGHTPROBE_PLANAR) DEF_ICON(LIGHTPROBE_GRID) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK647) - DEF_ICON(BLANK648) -#endif +DEF_ICON_BLANK(647) +DEF_ICON_BLANK(648) DEF_ICON(COLOR_RED) DEF_ICON(COLOR_GREEN) DEF_ICON(COLOR_BLUE) @@ -447,107 +409,103 @@ DEF_ICON(FORCE_BOID) DEF_ICON(FORCE_TURBULENCE) DEF_ICON(FORCE_DRAG) DEF_ICON(FORCE_SMOKEFLOW) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK673) - DEF_ICON(BLANK674) - DEF_ICON(BLANK675) - DEF_ICON(BLANK676) - DEF_ICON(BLANK677) - DEF_ICON(BLANK678) - DEF_ICON(BLANK679) - DEF_ICON(BLANK680) - DEF_ICON(BLANK681) - DEF_ICON(BLANK682) - DEF_ICON(BLANK683) - DEF_ICON(BLANK684) - DEF_ICON(BLANK685) +DEF_ICON_BLANK(673) +DEF_ICON_BLANK(674) +DEF_ICON_BLANK(675) +DEF_ICON_BLANK(676) +DEF_ICON_BLANK(677) +DEF_ICON_BLANK(678) +DEF_ICON_BLANK(679) +DEF_ICON_BLANK(680) +DEF_ICON_BLANK(681) +DEF_ICON_BLANK(682) +DEF_ICON_BLANK(683) +DEF_ICON_BLANK(684) +DEF_ICON_BLANK(685) /* EMPTY */ - DEF_ICON(BLANK690) /* XXX 'Temperature' icon! */ - DEF_ICON(BLANK691) /* XXX 'Temperature' icon! */ - DEF_ICON(BLANK692) /* XXX 'Gear' icon! */ -#endif +DEF_ICON_BLANK(690) /* XXX 'Temperature' icon! */ +DEF_ICON_BLANK(691) /* XXX 'Temperature' icon! */ +DEF_ICON_BLANK(692) /* XXX 'Gear' icon! */ DEF_ICON(NODE_INSERT_ON) DEF_ICON(NODE_INSERT_OFF) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK695) - DEF_ICON(BLANK696) - DEF_ICON(BLANK697) - DEF_ICON(BLANK698) - DEF_ICON(BLANK699) - DEF_ICON(BLANK700) - DEF_ICON(BLANK701) - DEF_ICON(BLANK702) - DEF_ICON(BLANK703) - DEF_ICON(BLANK704) - DEF_ICON(BLANK705) - DEF_ICON(BLANK706) - DEF_ICON(BLANK707) - DEF_ICON(BLANK708) - DEF_ICON(BLANK709) - DEF_ICON(BLANK710) - DEF_ICON(BLANK711) - DEF_ICON(BLANK712) - DEF_ICON(BLANK713) - DEF_ICON(BLANK714) - DEF_ICON(BLANK715) +DEF_ICON_BLANK(695) +DEF_ICON_BLANK(696) +DEF_ICON_BLANK(697) +DEF_ICON_BLANK(698) +DEF_ICON_BLANK(699) +DEF_ICON_BLANK(700) +DEF_ICON_BLANK(701) +DEF_ICON_BLANK(702) +DEF_ICON_BLANK(703) +DEF_ICON_BLANK(704) +DEF_ICON_BLANK(705) +DEF_ICON_BLANK(706) +DEF_ICON_BLANK(707) +DEF_ICON_BLANK(708) +DEF_ICON_BLANK(709) +DEF_ICON_BLANK(710) +DEF_ICON_BLANK(711) +DEF_ICON_BLANK(712) +DEF_ICON_BLANK(713) +DEF_ICON_BLANK(714) +DEF_ICON_BLANK(715) /* EMPTY */ - DEF_ICON(BLANK720) - DEF_ICON(BLANK721) - DEF_ICON(BLANK722) - DEF_ICON(BLANK733) - DEF_ICON(BLANK734) - DEF_ICON(BLANK735) - DEF_ICON(BLANK736) - DEF_ICON(BLANK737) - DEF_ICON(BLANK738) - DEF_ICON(BLANK739) - DEF_ICON(BLANK740) - DEF_ICON(BLANK741) - DEF_ICON(BLANK742) - DEF_ICON(BLANK743) - DEF_ICON(BLANK744) - DEF_ICON(BLANK745) - DEF_ICON(BLANK746) - DEF_ICON(BLANK747) - DEF_ICON(BLANK748) - DEF_ICON(BLANK749) - DEF_ICON(BLANK750) - DEF_ICON(BLANK751) - DEF_ICON(BLANK752) - DEF_ICON(BLANK753) - DEF_ICON(BLANK754) - DEF_ICON(BLANK755) +DEF_ICON_BLANK(720) +DEF_ICON_BLANK(721) +DEF_ICON_BLANK(722) +DEF_ICON_BLANK(733) +DEF_ICON_BLANK(734) +DEF_ICON_BLANK(735) +DEF_ICON_BLANK(736) +DEF_ICON_BLANK(737) +DEF_ICON_BLANK(738) +DEF_ICON_BLANK(739) +DEF_ICON_BLANK(740) +DEF_ICON_BLANK(741) +DEF_ICON_BLANK(742) +DEF_ICON_BLANK(743) +DEF_ICON_BLANK(744) +DEF_ICON_BLANK(745) +DEF_ICON_BLANK(746) +DEF_ICON_BLANK(747) +DEF_ICON_BLANK(748) +DEF_ICON_BLANK(749) +DEF_ICON_BLANK(750) +DEF_ICON_BLANK(751) +DEF_ICON_BLANK(752) +DEF_ICON_BLANK(753) +DEF_ICON_BLANK(754) +DEF_ICON_BLANK(755) /* EMPTY */ - DEF_ICON(BLANK760) - DEF_ICON(BLANK761) - DEF_ICON(BLANK762) - DEF_ICON(BLANK763) - DEF_ICON(BLANK764) - DEF_ICON(BLANK765) - DEF_ICON(BLANK766) - DEF_ICON(BLANK767) - DEF_ICON(BLANK768) - DEF_ICON(BLANK769) - DEF_ICON(BLANK770) - DEF_ICON(BLANK771) - DEF_ICON(BLANK772) - DEF_ICON(BLANK773) - DEF_ICON(BLANK774) - DEF_ICON(BLANK775) - DEF_ICON(BLANK776) - DEF_ICON(BLANK777) - DEF_ICON(BLANK778) - DEF_ICON(BLANK779) - DEF_ICON(BLANK780) - DEF_ICON(BLANK781) - DEF_ICON(BLANK782) - DEF_ICON(BLANK783) - DEF_ICON(BLANK784) - DEF_ICON(BLANK785) -#endif +DEF_ICON_BLANK(760) +DEF_ICON_BLANK(761) +DEF_ICON_BLANK(762) +DEF_ICON_BLANK(763) +DEF_ICON_BLANK(764) +DEF_ICON_BLANK(765) +DEF_ICON_BLANK(766) +DEF_ICON_BLANK(767) +DEF_ICON_BLANK(768) +DEF_ICON_BLANK(769) +DEF_ICON_BLANK(770) +DEF_ICON_BLANK(771) +DEF_ICON_BLANK(772) +DEF_ICON_BLANK(773) +DEF_ICON_BLANK(774) +DEF_ICON_BLANK(775) +DEF_ICON_BLANK(776) +DEF_ICON_BLANK(777) +DEF_ICON_BLANK(778) +DEF_ICON_BLANK(779) +DEF_ICON_BLANK(780) +DEF_ICON_BLANK(781) +DEF_ICON_BLANK(782) +DEF_ICON_BLANK(783) +DEF_ICON_BLANK(784) +DEF_ICON_BLANK(785) /* MODIFIERS */ DEF_ICON(MODIFIER) @@ -595,17 +553,15 @@ DEF_ICON(MOD_TRIANGULATE) DEF_ICON(MOD_WIREFRAME) DEF_ICON(MOD_DATA_TRANSFER) DEF_ICON(MOD_NORMALEDIT) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK169) - DEF_ICON(BLANK170) - DEF_ICON(BLANK171) - DEF_ICON(BLANK172) - DEF_ICON(BLANK173) - DEF_ICON(BLANK174) - DEF_ICON(BLANK175) - DEF_ICON(BLANK176) - DEF_ICON(BLANK177) -#endif +DEF_ICON_BLANK(169) +DEF_ICON_BLANK(170) +DEF_ICON_BLANK(171) +DEF_ICON_BLANK(172) +DEF_ICON_BLANK(173) +DEF_ICON_BLANK(174) +DEF_ICON_BLANK(175) +DEF_ICON_BLANK(176) +DEF_ICON_BLANK(177) /* ANIMATION */ DEF_ICON(REC) @@ -658,31 +614,25 @@ DEF_ICON(IPO_EASE_IN) DEF_ICON(IPO_EASE_OUT) DEF_ICON(IPO_EASE_IN_OUT) DEF_ICON(NORMALIZE_FCURVES) -#ifndef DEF_ICON_BLANK_SKIP /* available */ - DEF_ICON(BLANK204) - DEF_ICON(BLANK205) - DEF_ICON(BLANK206) - DEF_ICON(BLANK207) -#endif +DEF_ICON_BLANK(204) +DEF_ICON_BLANK(205) +DEF_ICON_BLANK(206) +DEF_ICON_BLANK(207) /* EDITING */ DEF_ICON(VERTEXSEL) DEF_ICON(EDGESEL) DEF_ICON(FACESEL) DEF_ICON(LOOPSEL) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK210) -#endif +DEF_ICON_BLANK(210) DEF_ICON(ROTATE) DEF_ICON(CURSOR) DEF_ICON(ROTATECOLLECTION) DEF_ICON(ROTATECENTER) DEF_ICON(ROTACTIVE) DEF_ICON(ALIGN) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK211) -#endif +DEF_ICON_BLANK(211) DEF_ICON(SMOOTHCURVE) DEF_ICON(SPHERECURVE) DEF_ICON(ROOTCURVE) @@ -720,13 +670,11 @@ DEF_ICON(CLIPUV_HLT) DEF_ICON(SNAP_PEEL_OBJECT) DEF_ICON(GRID) DEF_ICON(OBJECT_ORIGIN) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK222) - DEF_ICON(BLANK224) - DEF_ICON(BLANK225) - DEF_ICON(BLANK226) - DEF_ICON(BLANK226b) -#endif +DEF_ICON_BLANK(222) +DEF_ICON_BLANK(224) +DEF_ICON_BLANK(225) +DEF_ICON_BLANK(226) +DEF_ICON_BLANK(226b) /* EDITING */ DEF_ICON(PASTEDOWN) @@ -746,17 +694,15 @@ DEF_ICON(UV_EDGESEL) DEF_ICON(UV_FACESEL) DEF_ICON(UV_ISLANDSEL) DEF_ICON(UV_SYNC_SELECT) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK240) - DEF_ICON(BLANK241) - DEF_ICON(BLANK242) - DEF_ICON(BLANK243) - DEF_ICON(BLANK244) - DEF_ICON(BLANK245) - DEF_ICON(BLANK246) - DEF_ICON(BLANK247) - DEF_ICON(BLANK247b) -#endif +DEF_ICON_BLANK(240) +DEF_ICON_BLANK(241) +DEF_ICON_BLANK(242) +DEF_ICON_BLANK(243) +DEF_ICON_BLANK(244) +DEF_ICON_BLANK(245) +DEF_ICON_BLANK(246) +DEF_ICON_BLANK(247) +DEF_ICON_BLANK(247b) /* 3D VIEW */ DEF_ICON(BBOX) @@ -766,15 +712,11 @@ DEF_ICON(SMOOTH) DEF_ICON(POTATO) DEF_ICON(OVERLAY) DEF_ICON(ORTHO) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK249) - DEF_ICON(BLANK250) -#endif +DEF_ICON_BLANK(249) +DEF_ICON_BLANK(250) DEF_ICON(LOCKVIEW_OFF) DEF_ICON(LOCKVIEW_ON) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK251) -#endif +DEF_ICON_BLANK(251) DEF_ICON(AXIS_SIDE) DEF_ICON(AXIS_FRONT) DEF_ICON(AXIS_TOP) @@ -784,40 +726,38 @@ DEF_ICON(NDOF_FLY) DEF_ICON(NDOF_TRANS) DEF_ICON(LAYER_USED) DEF_ICON(LAYER_ACTIVE) -#ifndef DEF_ICON_BLANK_SKIP /* available */ - DEF_ICON(BLANK254) - DEF_ICON(BLANK255) - DEF_ICON(BLANK256) - DEF_ICON(BLANK257) - DEF_ICON(BLANK257b) - DEF_ICON(BLANK258) - DEF_ICON(BLANK259) - DEF_ICON(BLANK260) - DEF_ICON(BLANK261) - DEF_ICON(BLANK262) - DEF_ICON(BLANK263) - DEF_ICON(BLANK264) - DEF_ICON(BLANK265) - DEF_ICON(BLANK266) - DEF_ICON(BLANK267) - DEF_ICON(BLANK268) - DEF_ICON(BLANK269) - DEF_ICON(BLANK270) - DEF_ICON(BLANK271) - DEF_ICON(BLANK272) - DEF_ICON(BLANK273) - DEF_ICON(BLANK274) - DEF_ICON(BLANK275) - DEF_ICON(BLANK276) - DEF_ICON(BLANK277) - DEF_ICON(BLANK278) - DEF_ICON(BLANK279) - DEF_ICON(BLANK280) - DEF_ICON(BLANK281) - DEF_ICON(BLANK282) - DEF_ICON(BLANK282b) -#endif +DEF_ICON_BLANK(254) +DEF_ICON_BLANK(255) +DEF_ICON_BLANK(256) +DEF_ICON_BLANK(257) +DEF_ICON_BLANK(257b) +DEF_ICON_BLANK(258) +DEF_ICON_BLANK(259) +DEF_ICON_BLANK(260) +DEF_ICON_BLANK(261) +DEF_ICON_BLANK(262) +DEF_ICON_BLANK(263) +DEF_ICON_BLANK(264) +DEF_ICON_BLANK(265) +DEF_ICON_BLANK(266) +DEF_ICON_BLANK(267) +DEF_ICON_BLANK(268) +DEF_ICON_BLANK(269) +DEF_ICON_BLANK(270) +DEF_ICON_BLANK(271) +DEF_ICON_BLANK(272) +DEF_ICON_BLANK(273) +DEF_ICON_BLANK(274) +DEF_ICON_BLANK(275) +DEF_ICON_BLANK(276) +DEF_ICON_BLANK(277) +DEF_ICON_BLANK(278) +DEF_ICON_BLANK(279) +DEF_ICON_BLANK(280) +DEF_ICON_BLANK(281) +DEF_ICON_BLANK(282) +DEF_ICON_BLANK(282b) /* FILE SELECT */ DEF_ICON(SORTALPHA) @@ -856,25 +796,21 @@ DEF_ICON(IMPORT) DEF_ICON(EXPORT) DEF_ICON(EXTERNAL_DATA) DEF_ICON(LOAD_FACTORY) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK300) - DEF_ICON(BLANK301) - DEF_ICON(BLANK302) - DEF_ICON(BLANK303) - DEF_ICON(BLANK304) -#endif +DEF_ICON_BLANK(300) +DEF_ICON_BLANK(301) +DEF_ICON_BLANK(302) +DEF_ICON_BLANK(303) +DEF_ICON_BLANK(304) DEF_ICON(LOOP_BACK) DEF_ICON(LOOP_FORWARDS) DEF_ICON(BACK) DEF_ICON(FORWARD) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK309) - DEF_ICON(BLANK310) - DEF_ICON(BLANK311) - DEF_ICON(BLANK312) - DEF_ICON(BLANK313) - DEF_ICON(BLANK314) -#endif +DEF_ICON_BLANK(309) +DEF_ICON_BLANK(310) +DEF_ICON_BLANK(311) +DEF_ICON_BLANK(312) +DEF_ICON_BLANK(313) +DEF_ICON_BLANK(314) DEF_ICON(FILE_HIDDEN) DEF_ICON(FILE_BACKUP) DEF_ICON(DISK_DRIVE) @@ -888,12 +824,10 @@ DEF_ICON(HAIR) DEF_ICON(ALIASED) DEF_ICON(ANTIALIASED) DEF_ICON(MAT_SPHERE_SKY) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK319) - DEF_ICON(BLANK320) - DEF_ICON(BLANK321) - DEF_ICON(BLANK322) -#endif +DEF_ICON_BLANK(319) +DEF_ICON_BLANK(320) +DEF_ICON_BLANK(321) +DEF_ICON_BLANK(322) DEF_ICON(WORDWRAP_OFF) DEF_ICON(WORDWRAP_ON) DEF_ICON(SYNTAX_OFF) @@ -901,15 +835,13 @@ DEF_ICON(SYNTAX_ON) DEF_ICON(LINENUMBERS_OFF) DEF_ICON(LINENUMBERS_ON) DEF_ICON(SCRIPTPLUGINS) // XXX CREATE NEW -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK323) - DEF_ICON(BLANK324) - DEF_ICON(BLANK325) - DEF_ICON(BLANK326) - DEF_ICON(BLANK327) - DEF_ICON(BLANK328) - DEF_ICON(BLANK328b) -#endif +DEF_ICON_BLANK(323) +DEF_ICON_BLANK(324) +DEF_ICON_BLANK(325) +DEF_ICON_BLANK(326) +DEF_ICON_BLANK(327) +DEF_ICON_BLANK(328) +DEF_ICON_BLANK(328b) /* SEQUENCE / IMAGE EDITOR */ DEF_ICON(SEQ_SEQUENCER) @@ -918,30 +850,26 @@ DEF_ICON(SEQ_LUMA_WAVEFORM) DEF_ICON(SEQ_CHROMA_SCOPE) DEF_ICON(SEQ_HISTOGRAM) DEF_ICON(SEQ_SPLITVIEW) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK331) - DEF_ICON(BLANK332) - DEF_ICON(BLANK333) -#endif +DEF_ICON_BLANK(331) +DEF_ICON_BLANK(332) +DEF_ICON_BLANK(333) DEF_ICON(IMAGE_RGB) // XXX CHANGE TO STRAIGHT ALPHA, Z ETC DEF_ICON(IMAGE_RGB_ALPHA) DEF_ICON(IMAGE_ALPHA) DEF_ICON(IMAGE_ZDEPTH) DEF_ICON(IMAGEFILE) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK336) - DEF_ICON(BLANK337) - DEF_ICON(BLANK338) - DEF_ICON(BLANK339) - DEF_ICON(BLANK340) - DEF_ICON(BLANK341) - DEF_ICON(BLANK342) - DEF_ICON(BLANK343) - DEF_ICON(BLANK344) - DEF_ICON(BLANK345) - DEF_ICON(BLANK346) - DEF_ICON(BLANK346b) -#endif +DEF_ICON_BLANK(336) +DEF_ICON_BLANK(337) +DEF_ICON_BLANK(338) +DEF_ICON_BLANK(339) +DEF_ICON_BLANK(340) +DEF_ICON_BLANK(341) +DEF_ICON_BLANK(342) +DEF_ICON_BLANK(343) +DEF_ICON_BLANK(344) +DEF_ICON_BLANK(345) +DEF_ICON_BLANK(346) +DEF_ICON_BLANK(346b) /* brush icons */ @@ -1028,35 +956,35 @@ DEF_ICON(GPBRUSH_ERASE_SOFT) DEF_ICON(GPBRUSH_ERASE_HARD) DEF_ICON(GPBRUSH_ERASE_STROKE) -/* vector icons, VICO_ prefix added */ -DEF_VICO(SMALL_TRI_RIGHT_VEC) +/* Vector Icons */ +DEF_ICON_VECTOR(SMALL_TRI_RIGHT_VEC) -DEF_VICO(KEYTYPE_KEYFRAME_VEC) -DEF_VICO(KEYTYPE_BREAKDOWN_VEC) -DEF_VICO(KEYTYPE_EXTREME_VEC) -DEF_VICO(KEYTYPE_JITTER_VEC) -DEF_VICO(KEYTYPE_MOVING_HOLD_VEC) +DEF_ICON_VECTOR(KEYTYPE_KEYFRAME_VEC) +DEF_ICON_VECTOR(KEYTYPE_BREAKDOWN_VEC) +DEF_ICON_VECTOR(KEYTYPE_EXTREME_VEC) +DEF_ICON_VECTOR(KEYTYPE_JITTER_VEC) +DEF_ICON_VECTOR(KEYTYPE_MOVING_HOLD_VEC) -DEF_VICO(COLORSET_01_VEC) -DEF_VICO(COLORSET_02_VEC) -DEF_VICO(COLORSET_03_VEC) -DEF_VICO(COLORSET_04_VEC) -DEF_VICO(COLORSET_05_VEC) -DEF_VICO(COLORSET_06_VEC) -DEF_VICO(COLORSET_07_VEC) -DEF_VICO(COLORSET_08_VEC) -DEF_VICO(COLORSET_09_VEC) -DEF_VICO(COLORSET_10_VEC) -DEF_VICO(COLORSET_11_VEC) -DEF_VICO(COLORSET_12_VEC) -DEF_VICO(COLORSET_13_VEC) -DEF_VICO(COLORSET_14_VEC) -DEF_VICO(COLORSET_15_VEC) -DEF_VICO(COLORSET_16_VEC) -DEF_VICO(COLORSET_17_VEC) -DEF_VICO(COLORSET_18_VEC) -DEF_VICO(COLORSET_19_VEC) -DEF_VICO(COLORSET_20_VEC) +DEF_ICON_VECTOR(COLORSET_01_VEC) +DEF_ICON_VECTOR(COLORSET_02_VEC) +DEF_ICON_VECTOR(COLORSET_03_VEC) +DEF_ICON_VECTOR(COLORSET_04_VEC) +DEF_ICON_VECTOR(COLORSET_05_VEC) +DEF_ICON_VECTOR(COLORSET_06_VEC) +DEF_ICON_VECTOR(COLORSET_07_VEC) +DEF_ICON_VECTOR(COLORSET_08_VEC) +DEF_ICON_VECTOR(COLORSET_09_VEC) +DEF_ICON_VECTOR(COLORSET_10_VEC) +DEF_ICON_VECTOR(COLORSET_11_VEC) +DEF_ICON_VECTOR(COLORSET_12_VEC) +DEF_ICON_VECTOR(COLORSET_13_VEC) +DEF_ICON_VECTOR(COLORSET_14_VEC) +DEF_ICON_VECTOR(COLORSET_15_VEC) +DEF_ICON_VECTOR(COLORSET_16_VEC) +DEF_ICON_VECTOR(COLORSET_17_VEC) +DEF_ICON_VECTOR(COLORSET_18_VEC) +DEF_ICON_VECTOR(COLORSET_19_VEC) +DEF_ICON_VECTOR(COLORSET_20_VEC) /* Events */ DEF_ICON(EVENT_A) diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 94223d1ff46..112d4a0f33b 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -35,7 +35,9 @@ /* elubie: TODO: move the typedef for icons to UI_interface_icons.h */ /* and add/replace include of UI_resources.h by UI_interface_icons.h */ #define DEF_ICON(name) ICON_##name, -#define DEF_VICO(name) VICO_##name, +#define DEF_ICON_VECTOR(name) ICON_##name, +#define DEF_ICON_MONO(name) ICON_##name, +#define DEF_ICON_BLANK(name) ICON_BLANK_##name, typedef enum { /* ui */ @@ -46,7 +48,9 @@ typedef enum { #define BIFICONID_FIRST (ICON_NONE) #undef DEF_ICON -#undef DEF_VICO +#undef DEF_ICON_VECTOR +#undef DEF_ICON_MONO +#undef DEF_ICON_BLANK /* use to denote intentionally unset theme color */ #define TH_UNDEFINED -1 diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 50a5c711b2e..db08e441b01 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -111,6 +111,7 @@ typedef void (*VectorDrawFunc)(int x, int y, int w, int h, float alpha); #define ICON_TYPE_GEOM 5 #define ICON_TYPE_EVENT 6 /* draw keymap entries using custom renderer. */ #define ICON_TYPE_GPLAYER 7 +#define ICON_TYPE_BLANK 8 typedef struct DrawInfo { int type; @@ -154,6 +155,18 @@ typedef struct IconTexture { static struct ListBase iconfilelist = {NULL, NULL}; static IconTexture icongltex = {0, 0, 0, 0.0f, 0.0f}; +static const int icontypes[] = { +#define DEF_ICON(name) ICON_TYPE_TEXTURE, +#define DEF_ICON_VECTOR(name) ICON_TYPE_VECTOR, +#define DEF_ICON_MONO(name) ICON_TYPE_MONO_TEXTURE, +#define DEF_ICON_BLANK(name) ICON_TYPE_BLANK, +#include "UI_icons.h" +#undef DEF_ICON +#undef DEF_ICON_VECTOR +#undef DEF_ICON_MONO +#undef DEF_ICON_BLANK +}; + /* **************************************************** */ #ifndef WITH_HEADLESS @@ -364,34 +377,34 @@ static void vicon_colorset_draw(int index, int x, int y, int w, int h, float UNU immUnbindProgram(); } -#define DEF_VICON_COLORSET_DRAW_NTH(prefix, index) \ +#define DEF_ICON_VECTOR_COLORSET_DRAW_NTH(prefix, index) \ static void vicon_colorset_draw_##prefix(int x, int y, int w, int h, float alpha) \ { \ vicon_colorset_draw(index, x, y, w, h, alpha); \ } -DEF_VICON_COLORSET_DRAW_NTH(01, 0) -DEF_VICON_COLORSET_DRAW_NTH(02, 1) -DEF_VICON_COLORSET_DRAW_NTH(03, 2) -DEF_VICON_COLORSET_DRAW_NTH(04, 3) -DEF_VICON_COLORSET_DRAW_NTH(05, 4) -DEF_VICON_COLORSET_DRAW_NTH(06, 5) -DEF_VICON_COLORSET_DRAW_NTH(07, 6) -DEF_VICON_COLORSET_DRAW_NTH(08, 7) -DEF_VICON_COLORSET_DRAW_NTH(09, 8) -DEF_VICON_COLORSET_DRAW_NTH(10, 9) -DEF_VICON_COLORSET_DRAW_NTH(11, 10) -DEF_VICON_COLORSET_DRAW_NTH(12, 11) -DEF_VICON_COLORSET_DRAW_NTH(13, 12) -DEF_VICON_COLORSET_DRAW_NTH(14, 13) -DEF_VICON_COLORSET_DRAW_NTH(15, 14) -DEF_VICON_COLORSET_DRAW_NTH(16, 15) -DEF_VICON_COLORSET_DRAW_NTH(17, 16) -DEF_VICON_COLORSET_DRAW_NTH(18, 17) -DEF_VICON_COLORSET_DRAW_NTH(19, 18) -DEF_VICON_COLORSET_DRAW_NTH(20, 19) - -#undef DEF_VICON_COLORSET_DRAW_NTH +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(01, 0) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(02, 1) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(03, 2) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(04, 3) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(05, 4) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(06, 5) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(07, 6) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(08, 7) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(09, 8) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(10, 9) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(11, 10) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(12, 11) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(13, 12) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(14, 13) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(15, 14) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(16, 15) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(17, 16) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(18, 17) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(19, 18) +DEF_ICON_VECTOR_COLORSET_DRAW_NTH(20, 19) + +#undef DEF_ICON_VECTOR_COLORSET_DRAW_NTH /* Dynamically render icon instead of rendering a plain color to a texture/buffer * This is mot strictly a "vicon", as it needs access to icon->obj to get the color info, @@ -727,8 +740,12 @@ static void init_internal_icons(void) /* Define icons. */ for (y = 0; y < ICON_GRID_ROWS; y++) { /* Row W has monochrome icons. */ - int icontype = (y == 8) ? ICON_TYPE_MONO_TEXTURE : ICON_TYPE_TEXTURE; for (x = 0; x < ICON_GRID_COLS; x++) { + int icontype = icontypes[y * ICON_GRID_COLS + x]; + if (!ELEM(icontype, ICON_TYPE_TEXTURE, ICON_TYPE_MONO_TEXTURE)) { + continue; + } + def_internal_icon(b32buf, BIFICONID_FIRST + y * ICON_GRID_COLS + x, x * (ICON_GRID_W + ICON_GRID_MARGIN) + ICON_GRID_MARGIN, y * (ICON_GRID_H + ICON_GRID_MARGIN) + ICON_GRID_MARGIN, ICON_GRID_W, @@ -737,34 +754,34 @@ static void init_internal_icons(void) } } - def_internal_vicon(VICO_SMALL_TRI_RIGHT_VEC, vicon_small_tri_right_draw); - - def_internal_vicon(VICO_KEYTYPE_KEYFRAME_VEC, vicon_keytype_keyframe_draw); - def_internal_vicon(VICO_KEYTYPE_BREAKDOWN_VEC, vicon_keytype_breakdown_draw); - def_internal_vicon(VICO_KEYTYPE_EXTREME_VEC, vicon_keytype_extreme_draw); - def_internal_vicon(VICO_KEYTYPE_JITTER_VEC, vicon_keytype_jitter_draw); - def_internal_vicon(VICO_KEYTYPE_MOVING_HOLD_VEC, vicon_keytype_moving_hold_draw); - - def_internal_vicon(VICO_COLORSET_01_VEC, vicon_colorset_draw_01); - def_internal_vicon(VICO_COLORSET_02_VEC, vicon_colorset_draw_02); - def_internal_vicon(VICO_COLORSET_03_VEC, vicon_colorset_draw_03); - def_internal_vicon(VICO_COLORSET_04_VEC, vicon_colorset_draw_04); - def_internal_vicon(VICO_COLORSET_05_VEC, vicon_colorset_draw_05); - def_internal_vicon(VICO_COLORSET_06_VEC, vicon_colorset_draw_06); - def_internal_vicon(VICO_COLORSET_07_VEC, vicon_colorset_draw_07); - def_internal_vicon(VICO_COLORSET_08_VEC, vicon_colorset_draw_08); - def_internal_vicon(VICO_COLORSET_09_VEC, vicon_colorset_draw_09); - def_internal_vicon(VICO_COLORSET_10_VEC, vicon_colorset_draw_10); - def_internal_vicon(VICO_COLORSET_11_VEC, vicon_colorset_draw_11); - def_internal_vicon(VICO_COLORSET_12_VEC, vicon_colorset_draw_12); - def_internal_vicon(VICO_COLORSET_13_VEC, vicon_colorset_draw_13); - def_internal_vicon(VICO_COLORSET_14_VEC, vicon_colorset_draw_14); - def_internal_vicon(VICO_COLORSET_15_VEC, vicon_colorset_draw_15); - def_internal_vicon(VICO_COLORSET_16_VEC, vicon_colorset_draw_16); - def_internal_vicon(VICO_COLORSET_17_VEC, vicon_colorset_draw_17); - def_internal_vicon(VICO_COLORSET_18_VEC, vicon_colorset_draw_18); - def_internal_vicon(VICO_COLORSET_19_VEC, vicon_colorset_draw_19); - def_internal_vicon(VICO_COLORSET_20_VEC, vicon_colorset_draw_20); + def_internal_vicon(ICON_SMALL_TRI_RIGHT_VEC, vicon_small_tri_right_draw); + + def_internal_vicon(ICON_KEYTYPE_KEYFRAME_VEC, vicon_keytype_keyframe_draw); + def_internal_vicon(ICON_KEYTYPE_BREAKDOWN_VEC, vicon_keytype_breakdown_draw); + def_internal_vicon(ICON_KEYTYPE_EXTREME_VEC, vicon_keytype_extreme_draw); + def_internal_vicon(ICON_KEYTYPE_JITTER_VEC, vicon_keytype_jitter_draw); + def_internal_vicon(ICON_KEYTYPE_MOVING_HOLD_VEC, vicon_keytype_moving_hold_draw); + + def_internal_vicon(ICON_COLORSET_01_VEC, vicon_colorset_draw_01); + def_internal_vicon(ICON_COLORSET_02_VEC, vicon_colorset_draw_02); + def_internal_vicon(ICON_COLORSET_03_VEC, vicon_colorset_draw_03); + def_internal_vicon(ICON_COLORSET_04_VEC, vicon_colorset_draw_04); + def_internal_vicon(ICON_COLORSET_05_VEC, vicon_colorset_draw_05); + def_internal_vicon(ICON_COLORSET_06_VEC, vicon_colorset_draw_06); + def_internal_vicon(ICON_COLORSET_07_VEC, vicon_colorset_draw_07); + def_internal_vicon(ICON_COLORSET_08_VEC, vicon_colorset_draw_08); + def_internal_vicon(ICON_COLORSET_09_VEC, vicon_colorset_draw_09); + def_internal_vicon(ICON_COLORSET_10_VEC, vicon_colorset_draw_10); + def_internal_vicon(ICON_COLORSET_11_VEC, vicon_colorset_draw_11); + def_internal_vicon(ICON_COLORSET_12_VEC, vicon_colorset_draw_12); + def_internal_vicon(ICON_COLORSET_13_VEC, vicon_colorset_draw_13); + def_internal_vicon(ICON_COLORSET_14_VEC, vicon_colorset_draw_14); + def_internal_vicon(ICON_COLORSET_15_VEC, vicon_colorset_draw_15); + def_internal_vicon(ICON_COLORSET_16_VEC, vicon_colorset_draw_16); + def_internal_vicon(ICON_COLORSET_17_VEC, vicon_colorset_draw_17); + def_internal_vicon(ICON_COLORSET_18_VEC, vicon_colorset_draw_18); + def_internal_vicon(ICON_COLORSET_19_VEC, vicon_colorset_draw_19); + def_internal_vicon(ICON_COLORSET_20_VEC, vicon_colorset_draw_20); IMB_freeImBuf(b16buf); IMB_freeImBuf(b32buf); diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index e27dace4ba5..c4756e1635d 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -1029,7 +1029,7 @@ void buttons_context_draw(const bContext *C, uiLayout *layout) ptr = &path->ptr[a]; if (a != 0) - uiItemL(row, "", VICO_SMALL_TRI_RIGHT_VEC); + uiItemL(row, "", ICON_SMALL_TRI_RIGHT_VEC); if (ptr->data) { icon = RNA_struct_ui_icon(ptr->type); diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index 1dc57a0da7d..c8b3b182b9c 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -760,7 +760,7 @@ static void graph_draw_driven_property_panel(uiLayout *layout, ID *id, FCurve *f uiItemL(row, id->name + 2, icon); /* -> user friendly 'name' for F-Curve/driver target */ - uiItemL(row, "", VICO_SMALL_TRI_RIGHT_VEC); + uiItemL(row, "", ICON_SMALL_TRI_RIGHT_VEC); uiItemL(row, name, ICON_RNA); } diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 40caf919848..d3964698fa3 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -277,7 +277,7 @@ static void nla_panel_animdata(const bContext *C, Panel *pa) uiLayoutSetAlignment(row, UI_LAYOUT_ALIGN_LEFT); uiItemL(row, id->name + 2, RNA_struct_ui_icon(id_ptr.type)); /* id-block (src) */ - uiItemL(row, "", VICO_SMALL_TRI_RIGHT_VEC); /* expander */ + uiItemL(row, "", ICON_SMALL_TRI_RIGHT_VEC); /* expander */ uiItemL(row, IFACE_("Animation Data"), ICON_ANIM_DATA); /* animdata */ uiItemS(layout); diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h index 613454e2f33..56b82c6c2f9 100644 --- a/source/blender/makesrna/RNA_enum_types.h +++ b/source/blender/makesrna/RNA_enum_types.h @@ -181,7 +181,6 @@ extern const EnumPropertyItem rna_enum_navigation_mode_items[]; extern const EnumPropertyItem rna_enum_file_sort_items[]; extern const EnumPropertyItem rna_enum_node_socket_in_out_items[]; -extern const EnumPropertyItem rna_enum_node_icon_items[]; extern const EnumPropertyItem rna_enum_node_math_items[]; extern const EnumPropertyItem rna_enum_node_vec_math_items[]; diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index efd571d2b18..56565de37a8 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -72,11 +72,11 @@ const EnumPropertyItem rna_enum_fmodifier_type_items[] = { }; const EnumPropertyItem rna_enum_beztriple_keyframe_type_items[] = { - {BEZT_KEYTYPE_KEYFRAME, "KEYFRAME", VICO_KEYTYPE_KEYFRAME_VEC, "Keyframe", "Normal keyframe - e.g. for key poses"}, - {BEZT_KEYTYPE_BREAKDOWN, "BREAKDOWN", VICO_KEYTYPE_BREAKDOWN_VEC, "Breakdown", "A breakdown pose - e.g. for transitions between key poses"}, - {BEZT_KEYTYPE_MOVEHOLD, "MOVING_HOLD", VICO_KEYTYPE_MOVING_HOLD_VEC, "Moving Hold", "A keyframe that is part of a moving hold"}, - {BEZT_KEYTYPE_EXTREME, "EXTREME", VICO_KEYTYPE_EXTREME_VEC, "Extreme", "An 'extreme' pose, or some other purpose as needed"}, - {BEZT_KEYTYPE_JITTER, "JITTER", VICO_KEYTYPE_JITTER_VEC, "Jitter", "A filler or baked keyframe for keying on ones, or some other purpose as needed"}, + {BEZT_KEYTYPE_KEYFRAME, "KEYFRAME", ICON_KEYTYPE_KEYFRAME_VEC, "Keyframe", "Normal keyframe - e.g. for key poses"}, + {BEZT_KEYTYPE_BREAKDOWN, "BREAKDOWN", ICON_KEYTYPE_BREAKDOWN_VEC, "Breakdown", "A breakdown pose - e.g. for transitions between key poses"}, + {BEZT_KEYTYPE_MOVEHOLD, "MOVING_HOLD", ICON_KEYTYPE_MOVING_HOLD_VEC, "Moving Hold", "A keyframe that is part of a moving hold"}, + {BEZT_KEYTYPE_EXTREME, "EXTREME", ICON_KEYTYPE_EXTREME_VEC, "Extreme", "An 'extreme' pose, or some other purpose as needed"}, + {BEZT_KEYTYPE_JITTER, "JITTER", ICON_KEYTYPE_JITTER_VEC, "Jitter", "A filler or baked keyframe for keying on ones, or some other purpose as needed"}, {0, NULL, 0, NULL, NULL} }; diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 3cc8bac13e2..6d72d337a07 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -113,16 +113,6 @@ static const EnumPropertyItem node_chunksize_items[] = { }; #endif -#define DEF_ICON_BLANK_SKIP -#define DEF_ICON(name) {ICON_##name, (#name), 0, (#name), ""}, -#define DEF_VICO(name) -const EnumPropertyItem rna_enum_node_icon_items[] = { -#include "UI_icons.h" - {0, NULL, 0, NULL, NULL}}; -#undef DEF_ICON_BLANK_SKIP -#undef DEF_ICON -#undef DEF_VICO - const EnumPropertyItem rna_enum_node_math_items[] = { {NODE_MATH_ADD, "ADD", 0, "Add", ""}, {NODE_MATH_SUB, "SUBTRACT", 0, "Subtract", ""}, @@ -8021,7 +8011,7 @@ static void rna_def_node(BlenderRNA *brna) prop = RNA_def_property(srna, "bl_icon", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "typeinfo->ui_icon"); - RNA_def_property_enum_items(prop, rna_enum_node_icon_items); + RNA_def_property_enum_items(prop, rna_enum_icon_items); RNA_def_property_enum_default(prop, ICON_NODE); RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL); RNA_def_property_ui_text(prop, "Icon", "The node icon"); @@ -8409,7 +8399,7 @@ static void rna_def_nodetree(BlenderRNA *brna) prop = RNA_def_property(srna, "bl_icon", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "typeinfo->ui_icon"); - RNA_def_property_enum_items(prop, rna_enum_node_icon_items); + RNA_def_property_enum_items(prop, rna_enum_icon_items); RNA_def_property_enum_default(prop, ICON_NODETREE); RNA_def_property_flag(prop, PROP_REGISTER); RNA_def_property_ui_text(prop, "Icon", "The node tree icon"); diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index 322f5a02f57..d263e02d3f8 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -68,26 +68,26 @@ const EnumPropertyItem rna_enum_posebone_rotmode_items[] = { /* Bone and Group Color Sets */ const EnumPropertyItem rna_enum_color_sets_items[] = { {0, "DEFAULT", 0, "Default Colors", ""}, - {1, "THEME01", VICO_COLORSET_01_VEC, "01 - Theme Color Set", ""}, - {2, "THEME02", VICO_COLORSET_02_VEC, "02 - Theme Color Set", ""}, - {3, "THEME03", VICO_COLORSET_03_VEC, "03 - Theme Color Set", ""}, - {4, "THEME04", VICO_COLORSET_04_VEC, "04 - Theme Color Set", ""}, - {5, "THEME05", VICO_COLORSET_05_VEC, "05 - Theme Color Set", ""}, - {6, "THEME06", VICO_COLORSET_06_VEC, "06 - Theme Color Set", ""}, - {7, "THEME07", VICO_COLORSET_07_VEC, "07 - Theme Color Set", ""}, - {8, "THEME08", VICO_COLORSET_08_VEC, "08 - Theme Color Set", ""}, - {9, "THEME09", VICO_COLORSET_09_VEC, "09 - Theme Color Set", ""}, - {10, "THEME10", VICO_COLORSET_10_VEC, "10 - Theme Color Set", ""}, - {11, "THEME11", VICO_COLORSET_11_VEC, "11 - Theme Color Set", ""}, - {12, "THEME12", VICO_COLORSET_12_VEC, "12 - Theme Color Set", ""}, - {13, "THEME13", VICO_COLORSET_13_VEC, "13 - Theme Color Set", ""}, - {14, "THEME14", VICO_COLORSET_14_VEC, "14 - Theme Color Set", ""}, - {15, "THEME15", VICO_COLORSET_15_VEC, "15 - Theme Color Set", ""}, - {16, "THEME16", VICO_COLORSET_16_VEC, "16 - Theme Color Set", ""}, - {17, "THEME17", VICO_COLORSET_17_VEC, "17 - Theme Color Set", ""}, - {18, "THEME18", VICO_COLORSET_18_VEC, "18 - Theme Color Set", ""}, - {19, "THEME19", VICO_COLORSET_19_VEC, "19 - Theme Color Set", ""}, - {20, "THEME20", VICO_COLORSET_20_VEC, "20 - Theme Color Set", ""}, + {1, "THEME01", ICON_COLORSET_01_VEC, "01 - Theme Color Set", ""}, + {2, "THEME02", ICON_COLORSET_02_VEC, "02 - Theme Color Set", ""}, + {3, "THEME03", ICON_COLORSET_03_VEC, "03 - Theme Color Set", ""}, + {4, "THEME04", ICON_COLORSET_04_VEC, "04 - Theme Color Set", ""}, + {5, "THEME05", ICON_COLORSET_05_VEC, "05 - Theme Color Set", ""}, + {6, "THEME06", ICON_COLORSET_06_VEC, "06 - Theme Color Set", ""}, + {7, "THEME07", ICON_COLORSET_07_VEC, "07 - Theme Color Set", ""}, + {8, "THEME08", ICON_COLORSET_08_VEC, "08 - Theme Color Set", ""}, + {9, "THEME09", ICON_COLORSET_09_VEC, "09 - Theme Color Set", ""}, + {10, "THEME10", ICON_COLORSET_10_VEC, "10 - Theme Color Set", ""}, + {11, "THEME11", ICON_COLORSET_11_VEC, "11 - Theme Color Set", ""}, + {12, "THEME12", ICON_COLORSET_12_VEC, "12 - Theme Color Set", ""}, + {13, "THEME13", ICON_COLORSET_13_VEC, "13 - Theme Color Set", ""}, + {14, "THEME14", ICON_COLORSET_14_VEC, "14 - Theme Color Set", ""}, + {15, "THEME15", ICON_COLORSET_15_VEC, "15 - Theme Color Set", ""}, + {16, "THEME16", ICON_COLORSET_16_VEC, "16 - Theme Color Set", ""}, + {17, "THEME17", ICON_COLORSET_17_VEC, "17 - Theme Color Set", ""}, + {18, "THEME18", ICON_COLORSET_18_VEC, "18 - Theme Color Set", ""}, + {19, "THEME19", ICON_COLORSET_19_VEC, "19 - Theme Color Set", ""}, + {20, "THEME20", ICON_COLORSET_20_VEC, "20 - Theme Color Set", ""}, {-1, "CUSTOM", 0, "Custom Color Set", ""}, {0, NULL, 0, NULL, NULL} }; diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index f340b471455..ec0349e2a4b 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -47,16 +47,18 @@ #include "rna_internal.h" -#define DEF_ICON_BLANK_SKIP #define DEF_ICON(name) {ICON_##name, (#name), 0, (#name), ""}, -#define DEF_VICO(name) {VICO_##name, (#name), 0, (#name), ""}, +#define DEF_ICON_VECTOR(name) {ICON_##name, (#name), 0, (#name), ""}, +#define DEF_ICON_MONO(name) {ICON_##name, (#name), 0, (#name), ""}, +#define DEF_ICON_BLANK(name) const EnumPropertyItem rna_enum_icon_items[] = { #include "UI_icons.h" {0, NULL, 0, NULL, NULL} }; -#undef DEF_ICON_BLANK_SKIP #undef DEF_ICON -#undef DEF_VICO +#undef DEF_ICON_VECTOR +#undef DEF_ICON_MONO +#undef DEF_ICON_BLANK #ifdef RNA_RUNTIME |