Merged changes in the trunk up to revision 30551.

2010-07-20 19:39:07 +00:00
parent bd68a72869
commit e423e085f8
200 changed files with 20606 additions and 12262 deletions
--- a/source/blender/python/generic/blf_api.c
+++ b/source/blender/python/generic/blf_api.c
@@ -153,7 +153,7 @@ static PyObject *py_blf_draw(PyObject *self, PyObject *args)
 static char py_blf_dimensions_doc[] =
 ".. function:: dimensions(fontid, text)\n"
 "\n"
-"   Return the width and hight of the text.\n"
+"   Return the width and height of the text.\n"
 "\n"
 "   :arg fontid: The id of the typeface as returned by :func:`blf.load`, for default font use 0.\n"
 "   :type fontid: int\n"