Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-11 23:15:05 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-11 23:15:05 +0300
commit6aca3e43ec83ae0c64ba3c06c1a96e1137b875db (patch)
tree381bf019922025beda2868e00ae54fc0be519d62 /source/blender
parentbd30a6350b3dbdc7967d546366fc0c52b75d5a09 (diff)
UI: tweaks to icon defaults
Minor changes to fit w/ new icons.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/datafiles/CMakeLists.txt6
-rw-r--r--source/blender/editors/interface/interface_widgets.c4
-rw-r--r--source/blender/editors/interface/resources.c8
3 files changed, 12 insertions, 6 deletions
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index 3ebf3c60ab2..23b328aa8e0 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -585,6 +585,12 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
ops.mesh.loopcut_slide
ops.mesh.offset_edge_loops_slide
ops.mesh.polybuild_hover
+ ops.mesh.primitive_cone_add_manipulator
+ ops.mesh.primitive_cube_add_manipulator
+ ops.mesh.primitive_cylinder_add_manipulator
+ ops.mesh.primitive_grid_add_manipulator
+ ops.mesh.primitive_sphere_add_manipulator
+ ops.mesh.primitive_torus_add_manipulator
ops.mesh.rip
ops.mesh.rip_edge
ops.mesh.spin
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index b1cacdc5db6..d5631ab8eb3 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2316,8 +2316,8 @@ static struct uiWidgetColors wcol_tool = {
static struct uiWidgetColors wcol_toolbar_item = {
.outline = {0x19, 0x19, 0x19, 0xff},
.inner = {0x46, 0x46, 0x46, 0xff},
- .inner_sel = {0xb4, 0xb4, 0xb4, 0xff},
- .item = {0x19, 0x19, 0x19, 0xff},
+ .inner_sel = {0xcc, 0xcc, 0xcc, 0xff},
+ .item = {0x0, 0x0, 0x0, 0xff},
.text = {0xff, 0xff, 0xff, 0xff},
.text_sel = {0x33, 0x33, 0x33, 0xff},
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 1b4c289b0eb..95a7d0a0d06 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -2981,10 +2981,10 @@ void init_userdef_do_versions(void)
if (((bTheme *)U.themes.first)->tui.wcol_toolbar_item.text[3] == 0) {
struct uiWidgetColors wcol_toolbar_item = {
- .outline = {0x19, 0x19, 0x19, 0xff},
+ .outline = {0x0, 0x0, 0x0, 0xff},
.inner = {0x46, 0x46, 0x46, 0xff},
- .inner_sel = {0xb4, 0xb4, 0xb4, 0xff},
- .item = {0x19, 0x19, 0x19, 0xff},
+ .inner_sel = {0xcc, 0xcc, 0xcc, 0xff},
+ .item = {0x0, 0x0, 0x0, 0xff},
.text = {0xff, 0xff, 0xff, 0xff},
.text_sel = {0x33, 0x33, 0x33, 0xff},
@@ -2997,7 +2997,7 @@ void init_userdef_do_versions(void)
};
for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) {
btheme->tui.wcol_toolbar_item = wcol_toolbar_item;
- btheme->tui.icon_saturation = 0.4f;
+ btheme->tui.icon_saturation = 1.0f;
}
}