[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47589] branches/soc-2012-swiss_cheese/ source/blender/blenfont: missed files
Jason Wilkins
Jason.A.Wilkins at gmail.com
Thu Jun 7 22:11:23 CEST 2012
Revision: 47589
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47589
Author: jwilkins
Date: 2012-06-07 20:11:22 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
missed files
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/source/blender/blenfont/BLF_api.h
branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_internal_types.h
Modified: branches/soc-2012-swiss_cheese/source/blender/blenfont/BLF_api.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenfont/BLF_api.h 2012-06-07 20:09:55 UTC (rev 47588)
+++ branches/soc-2012-swiss_cheese/source/blender/blenfont/BLF_api.h 2012-06-07 20:11:22 UTC (rev 47589)
@@ -81,7 +81,7 @@
/* Draw large blocks of text more efficiently by
explicitely reserving OpenGL for that purpose*/
void BLF_draw_lock(int fontid);
-void BLF_draw_unlock(void);
+void BLF_draw_unlock(int fontid);
/* This function return the bounding box of the string
* and are not multiplied by the aspect.
Modified: branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_internal_types.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_internal_types.h 2012-06-07 20:09:55 UTC (rev 47588)
+++ branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_internal_types.h 2012-06-07 20:11:22 UTC (rev 47589)
@@ -213,6 +213,8 @@
/* and the color, the alphas is get from the glyph! */
float b_col[4];
+
+ int locked;
} FontBLF;
typedef struct DirBLF {
More information about the Bf-blender-cvs
mailing list