diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-01-15 08:45:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-15 08:46:32 +0400 |
| commit | 435a896fbe458b0e6046aecced5a7bc52e4f7333 (patch) | |
| tree | 4f644445cb96665181cba078ea0afd66cc90ee71 /source/blender/editors/interface | |
| parent | a19f0775417420396122ae17e528b6c2e4b80555 (diff) | |
Fix for mistake in recent shadow addition in tabs
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_panel.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index 6a12f43e46c..69649651837 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -1450,6 +1450,10 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active) ui_fontscale(&fstyle_points, aspect / (U.pixelsize * 1.1f)); BLF_size(fontid, fstyle_points, U.dpi); + BLF_enable(fontid, BLF_SHADOW); + BLF_shadow(fontid, 3, 1.0f, 1.0f, 1.0f, 0.25f); + BLF_shadow_offset(fontid, -1, -1); + BLI_assert(UI_panel_category_is_visible(ar)); @@ -1543,12 +1547,8 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active) /* tab titles */ - /* first draw shadow, in this case white */ - glColor3ubv(theme_col_text); /* draw white shadow to give text more depth */ - BLF_enable(fontid, BLF_SHADOW); - BLF_shadow(fontid, 3, 1.0f, 1.0f, 1.0f, 0.25f); - BLF_shadow_offset(fontid, -1, -1); + glColor3ubv(theme_col_text); /* main tab title */ BLF_draw(fontid, category_id_draw, category_draw_len); @@ -1592,6 +1592,8 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active) BLF_disable(fontid, BLF_ROTATION); + BLF_disable(fontid, BLF_SHADOW); + if (fstyle->kerning == 1) { BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT); } |