[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47263] branches/soc-2012-swiss_cheese/ source/blender/blenfont/intern/blf.c: Previous commit removed the automatic loading of glColor that I experimented with .

[Jason Wilkins]

Revision: 47263
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47263
Author:   jwilkins
Date:     2012-05-31 09:21:19 +0000 (Thu, 31 May 2012)
Log Message:
-----------
Previous commit removed the automatic loading of glColor that I experimented with.  This small change is needed for fonts to render the correct color.

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-05-31 09:18:00 UTC (rev 47262)
+++ branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c	2012-05-31 09:21:19 UTC (rev 47263)
@@ -556,9 +556,13 @@
 	if (font->flags & BLF_ROTATION)
 		glRotatef(font->angle, 0.0f, 0.0f, 1.0f);
 
-	if (font->shadow || font->blur)
-		glGetFloatv(GL_CURRENT_COLOR, font->orig_col);
+	/*if (font->shadow || font->blur)
+		glGetFloatv(GL_CURRENT_COLOR, font->orig_col); */
 
+	/* XXX: Temporarily needed to interoperate with legacy GL */
+	glGetFloatv(GL_CURRENT_COLOR, font->orig_col);
+	gpuColor4fv(font->orig_col);
+
 	/* always bind the texture for the first glyph */
 	font->tex_bind_state = -1;