[Bf-blender-cvs] [1a0181bb6d9] blender2.8: UI: add support for defining any icon as a mono icon.
Brecht Van Lommel
noreply at git.blender.org
Thu Sep 20 19:16:52 CEST 2018
Commit: 1a0181bb6d94252fb4e4873eca8cdedc69c348be
Author: Brecht Van Lommel
Date: Thu Sep 20 18:07:58 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB1a0181bb6d94252fb4e4873eca8cdedc69c348be
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.
===================================================================
M source/blender/editors/include/UI_icons.h
M source/blender/editors/include/UI_resources.h
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_graph/graph_buttons.c
M source/blender/editors/space_nla/nla_buttons.c
M source/blender/makesrna/RNA_enum_types.h
M source/blender/makesrna/intern/rna_fcurve.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_pose.c
M source/blender/makesrna/intern/rna_ui_api.c
===================================================================
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
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list