[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47527] branches/soc-2012-swiss_cheese/ source/blender/blenfont/intern/blf.c: workaround for font color was not quite right

[Jason Wilkins]

Revision: 47527
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47527
Author:   jwilkins
Date:     2012-06-06 17:18:14 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
workaround for font color was not quite right

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c

Modified: branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c	2012-06-06 17:11:51 UTC (rev 47526)
+++ branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c	2012-06-06 17:18:14 UTC (rev 47527)
@@ -559,10 +559,11 @@
 	if (font->flags & BLF_ROTATION)
 		glRotatef(font->angle, 0.0f, 0.0f, 1.0f);
 
-	if (font->shadow || font->blur)
-		gpuGetCurrentColor4fv(font->orig_col);
+	/* if (font->shadow || font->blur) 
+		gpuGetCurrentColor4fv(font->orig_col); */
 
-	gpuCurrentColor4fv(font->orig_col); // XXX: workaround
+	gpuGetCurrentColor4fv(font->orig_col);  // XXX: workaround
+	gpuCurrentColor4fv(font->orig_col);
 
 	/* always bind the texture for the first glyph */
 	font->tex_bind_state = -1;