UI: color icons in the properties editor tabs
Still can use more tweaks and icon reorganization, but this gets us closer to the intended design so we can evaluate it. Ref T61561, T63521.
This commit is contained in:
@@ -139,12 +139,12 @@ DEF_ICON_BLANK(145)
|
||||
DEF_ICON_BLANK(146)
|
||||
DEF_ICON(SCRIPT)
|
||||
DEF_ICON_MODIFIER(PARTICLES)
|
||||
DEF_ICON(PHYSICS)
|
||||
DEF_ICON(SPEAKER)
|
||||
DEF_ICON_MODIFIER(PHYSICS)
|
||||
DEF_ICON_OBJECT_DATA(SPEAKER)
|
||||
DEF_ICON_BLANK(151)
|
||||
DEF_ICON(TOOL_SETTINGS)
|
||||
DEF_ICON(SHADERFX)
|
||||
DEF_ICON(MODIFIER)
|
||||
DEF_ICON_MODIFIER(SHADERFX)
|
||||
DEF_ICON_MODIFIER(MODIFIER)
|
||||
DEF_ICON_BLANK(155)
|
||||
DEF_ICON_BLANK(156)
|
||||
DEF_ICON_BLANK(157)
|
||||
@@ -163,7 +163,7 @@ DEF_ICON(FILEBROWSER)
|
||||
DEF_ICON(IMAGE)
|
||||
DEF_ICON(INFO)
|
||||
DEF_ICON(SEQUENCE)
|
||||
DEF_ICON(TEXT)
|
||||
DEF_ICON_OBJECT_DATA(TEXT)
|
||||
DEF_ICON_BLANK(174)
|
||||
DEF_ICON(SOUND)
|
||||
DEF_ICON(ACTION)
|
||||
@@ -214,24 +214,24 @@ DEF_ICON_BLANK(77b)
|
||||
DEF_ICON(SCENE_DATA)
|
||||
DEF_ICON(RENDERLAYERS)
|
||||
DEF_ICON_SHADING(WORLD_DATA)
|
||||
DEF_ICON(OBJECT_DATA)
|
||||
DEF_ICON(MESH_DATA)
|
||||
DEF_ICON(CURVE_DATA)
|
||||
DEF_ICON(META_DATA)
|
||||
DEF_ICON(LATTICE_DATA)
|
||||
DEF_ICON_SHADING(LIGHT_DATA)
|
||||
DEF_ICON_OBJECT(OBJECT_DATA)
|
||||
DEF_ICON_OBJECT_DATA(MESH_DATA)
|
||||
DEF_ICON_OBJECT_DATA(CURVE_DATA)
|
||||
DEF_ICON_OBJECT_DATA(META_DATA)
|
||||
DEF_ICON_OBJECT_DATA(LATTICE_DATA)
|
||||
DEF_ICON_OBJECT_DATA(LIGHT_DATA)
|
||||
DEF_ICON_SHADING(MATERIAL_DATA)
|
||||
DEF_ICON_SHADING(TEXTURE_DATA)
|
||||
DEF_ICON(ANIM_DATA)
|
||||
DEF_ICON(CAMERA_DATA)
|
||||
DEF_ICON(PARTICLE_DATA)
|
||||
DEF_ICON_OBJECT_DATA(CAMERA_DATA)
|
||||
DEF_ICON_OBJECT_DATA(PARTICLE_DATA)
|
||||
DEF_ICON(LIBRARY_DATA_DIRECT)
|
||||
DEF_ICON_COLLECTION(GROUP)
|
||||
DEF_ICON(ARMATURE_DATA)
|
||||
DEF_ICON_OBJECT_DATA(ARMATURE_DATA)
|
||||
DEF_ICON(COMMUNITY)
|
||||
DEF_ICON(BONE_DATA)
|
||||
DEF_ICON_OBJECT_DATA(BONE_DATA)
|
||||
DEF_ICON_MODIFIER(CONSTRAINT)
|
||||
DEF_ICON(SHAPEKEY_DATA)
|
||||
DEF_ICON_OBJECT_DATA(SHAPEKEY_DATA)
|
||||
DEF_ICON_MODIFIER(CONSTRAINT_BONE)
|
||||
DEF_ICON(CAMERA_STEREO)
|
||||
DEF_ICON(PACKAGE)
|
||||
@@ -245,8 +245,8 @@ DEF_ICON(FILE)
|
||||
DEF_ICON(FCURVE)
|
||||
DEF_ICON(FONT_DATA)
|
||||
DEF_ICON(RENDER_RESULT)
|
||||
DEF_ICON(SURFACE_DATA)
|
||||
DEF_ICON(EMPTY_DATA)
|
||||
DEF_ICON_OBJECT_DATA(SURFACE_DATA)
|
||||
DEF_ICON_OBJECT_DATA(EMPTY_DATA)
|
||||
DEF_ICON(PRESET)
|
||||
DEF_ICON(RENDER_ANIMATION)
|
||||
DEF_ICON(RENDER_STILL)
|
||||
@@ -254,7 +254,7 @@ DEF_ICON(LIBRARY_DATA_BROKEN)
|
||||
DEF_ICON(BOIDS)
|
||||
DEF_ICON(STRANDS)
|
||||
DEF_ICON(LIBRARY_DATA_INDIRECT)
|
||||
DEF_ICON(GREASEPENCIL)
|
||||
DEF_ICON_OBJECT_DATA(GREASEPENCIL)
|
||||
DEF_ICON_SHADING(LINE_DATA)
|
||||
DEF_ICON(LIBRARY_DATA_OVERRIDE)
|
||||
DEF_ICON(GROUP_BONE)
|
||||
@@ -363,11 +363,11 @@ DEF_ICON(MESH_TORUS)
|
||||
DEF_ICON(MESH_CONE)
|
||||
DEF_ICON(MESH_CAPSULE)
|
||||
DEF_ICON(EMPTY_SINGLE_ARROW)
|
||||
DEF_ICON_SHADING(LIGHT_POINT)
|
||||
DEF_ICON_SHADING(LIGHT_SUN)
|
||||
DEF_ICON_SHADING(LIGHT_SPOT)
|
||||
DEF_ICON_SHADING(LIGHT_HEMI)
|
||||
DEF_ICON_SHADING(LIGHT_AREA)
|
||||
DEF_ICON_OBJECT_DATA(LIGHT_POINT)
|
||||
DEF_ICON_OBJECT_DATA(LIGHT_SUN)
|
||||
DEF_ICON_OBJECT_DATA(LIGHT_SPOT)
|
||||
DEF_ICON_OBJECT_DATA(LIGHT_HEMI)
|
||||
DEF_ICON_OBJECT_DATA(LIGHT_AREA)
|
||||
DEF_ICON(CUBE)
|
||||
DEF_ICON(SPHERE)
|
||||
DEF_ICON(CONE)
|
||||
@@ -393,9 +393,9 @@ DEF_ICON(CURVE_BEZCIRCLE)
|
||||
DEF_ICON(CURVE_NCURVE)
|
||||
DEF_ICON(CURVE_NCIRCLE)
|
||||
DEF_ICON(CURVE_PATH)
|
||||
DEF_ICON_SHADING(LIGHTPROBE_CUBEMAP)
|
||||
DEF_ICON_SHADING(LIGHTPROBE_PLANAR)
|
||||
DEF_ICON_SHADING(LIGHTPROBE_GRID)
|
||||
DEF_ICON_OBJECT_DATA(LIGHTPROBE_CUBEMAP)
|
||||
DEF_ICON_OBJECT_DATA(LIGHTPROBE_PLANAR)
|
||||
DEF_ICON_OBJECT_DATA(LIGHTPROBE_GRID)
|
||||
DEF_ICON_BLANK(406)
|
||||
DEF_ICON_BLANK(407)
|
||||
DEF_ICON(COLOR_RED)
|
||||
|
||||
@@ -1356,7 +1356,9 @@ bool UI_GetIconThemeColor4fv(int colorid, float col[4])
|
||||
/* Only colored icons in outliner and popups, overall UI is intended
|
||||
* to stay monochrome and out of the way except a few places where it
|
||||
* is important to communicate different data types. */
|
||||
if (!((theme_spacetype == SPACE_OUTLINER) || (theme_regionid == RGN_TYPE_TEMPORARY))) {
|
||||
if (!((theme_spacetype == SPACE_OUTLINER && theme_regionid == RGN_TYPE_WINDOW) ||
|
||||
(theme_spacetype == SPACE_PROPERTIES && theme_regionid == RGN_TYPE_NAV_BAR) ||
|
||||
(theme_regionid == RGN_TYPE_TEMPORARY))) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user