diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-06-13 09:17:14 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-06-13 13:38:53 +0300 |
commit | 23c24cead582f8d766e87ba9adc0f612b16bceea (patch) | |
tree | 482d66e6a25fc9e7a4057fc6f3f55548844eb96f /source/blender/editors | |
parent | c0926d536fb0495930799006d009819a58707c3e (diff) |
T55456: EditMode Drawing
- Hide facedots, except when in V3D_ZBUF_SELECT mode
`use_occluded_geometry`
- Different theme (wire_inactive) when not in edge selection mode
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/include/UI_resources.h | 1 | ||||
-rw-r--r-- | source/blender/editors/interface/resources.c | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index cab0fa8645d..48afea6bbf0 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -90,6 +90,7 @@ typedef enum ThemeColorID { TH_WIRE, TH_WIRE_INNER, TH_WIRE_EDIT, + TH_WIRE_INACTIVE, TH_SELECT, TH_ACTIVE, TH_GROUP, diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 2a61be21589..ebf900c1cff 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -298,6 +298,8 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo cp = ts->syntaxr; break; case TH_WIRE_EDIT: cp = ts->wire_edit; break; + case TH_WIRE_INACTIVE: + cp = ts->wire_inactive; break; case TH_LAMP: cp = ts->lamp; break; case TH_SPEAKER: @@ -934,6 +936,7 @@ void ui_theme_init_default(void) rgba_char_args_set(btheme->tv3d.view_overlay, 0, 0, 0, 255); rgba_char_args_set(btheme->tv3d.wire, 0x0, 0x0, 0x0, 255); rgba_char_args_set(btheme->tv3d.wire_edit, 0x0, 0x0, 0x0, 255); + rgba_char_args_set(btheme->tv3d.wire_inactive, 128, 128, 128, 255); rgba_char_args_set(btheme->tv3d.lamp, 0, 0, 0, 40); rgba_char_args_set(btheme->tv3d.speaker, 0, 0, 0, 255); rgba_char_args_set(btheme->tv3d.camera, 0, 0, 0, 255); @@ -3046,6 +3049,17 @@ void init_userdef_do_versions(Main *bmain) } } + for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) { + ThemeSpace *ts; + + for (ts = UI_THEMESPACE_START(btheme); ts != UI_THEMESPACE_END(btheme); ts++) { + if (btheme->tv3d.wire_inactive[3] == 0) { + rgba_char_args_set(btheme->tv3d.wire_inactive, 128, 128, 128, 255); + } + } + } + + if (U.pixelsize == 0.0f) U.pixelsize = 1.0f; |