[Bf-blender-cvs] [435a896] master: Fix for mistake in recent shadow addition in tabs

[Campbell Barton]

Commit: 435a896fbe458b0e6046aecced5a7bc52e4f7333
Author: Campbell Barton
Date:   Wed Jan 15 15:45:55 2014 +1100
https://developer.blender.org/rB435a896fbe458b0e6046aecced5a7bc52e4f7333

Fix for mistake in recent shadow addition in tabs

===================================================================

M       source/blender/editors/gpencil/editaction_gpencil.c
M       source/blender/editors/interface/interface_panel.c

===================================================================

diff --git a/source/blender/editors/gpencil/editaction_gpencil.c 
b/source/blender/editors/gpencil/editaction_gpencil.c
index cb3135c..9b7d691 100644
--- a/source/blender/editors/gpencil/editaction_gpencil.c
+++ b/source/blender/editors/gpencil/editaction_gpencil.c
@@ -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
diff --git a/source/blender/editors/interface/interface_panel.c 
b/source/blender/editors/interface/interface_panel.c
index 6a12f43..6964965 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);
        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs