blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix for mistake in recent shadow addition in tabs

This commit is contained in:
Campbell Barton 2014-01-15 15:45:55 +11:00
parent a19f077541
commit 435a896fbe
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/gpencil/editaction_gpencil.c
View File

@ -469,9 +469,9 @@ void paste_gpdata(Scene *scene)
/* -------------------------------------- */
/* Snap Tools */
static short snap_gpf_nearest(bGPDframe *gpf, Scene *UNUSED(scene))
static short snap_gpf_nearest(bGPDframe *UNUSED(gpf), Scene *UNUSED(scene))
{
#if 0 /* XXX: gpf->framenum is already an int! */
#if 0 /* note: gpf->framenum is already an int! */
if (gpf->flag & GP_FRAME_SELECT)
gpf->framenum = (int)(floor(gpf->framenum + 0.5));
#endif

12
source/blender/editors/interface/interface_panel.c
View File

@ -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);
}