[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54708] trunk/blender/source/blender: use radians for BLF_rotation

Campbell Barton ideasman42 at gmail.com
Thu Feb 21 18:15:19 CET 2013


Revision: 54708
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54708
Author:   campbellbarton
Date:     2013-02-21 17:15:19 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
use radians for BLF_rotation

Modified Paths:
--------------
    trunk/blender/source/blender/blenfont/intern/blf.c
    trunk/blender/source/blender/blenfont/intern/blf_internal_types.h
    trunk/blender/source/blender/editors/interface/view2d.c

Modified: trunk/blender/source/blender/blenfont/intern/blf.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf.c	2013-02-21 17:14:27 UTC (rev 54707)
+++ trunk/blender/source/blender/blenfont/intern/blf.c	2013-02-21 17:15:19 UTC (rev 54708)
@@ -516,8 +516,8 @@
 	if (font->flags & BLF_ASPECT)
 		glScalef(font->aspect[0], font->aspect[1], font->aspect[2]);
 
-	if (font->flags & BLF_ROTATION)
-		glRotatef(font->angle, 0.0f, 0.0f, 1.0f);
+	if (font->flags & BLF_ROTATION)  /* radians -> degrees */
+		glRotatef(font->angle * (float)(180.0 / M_PI), 0.0f, 0.0f, 1.0f);
 
 	if (font->shadow || font->blur)
 		glGetFloatv(GL_CURRENT_COLOR, font->orig_col);

Modified: trunk/blender/source/blender/blenfont/intern/blf_internal_types.h
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_internal_types.h	2013-02-21 17:14:27 UTC (rev 54707)
+++ trunk/blender/source/blender/blenfont/intern/blf_internal_types.h	2013-02-21 17:15:19 UTC (rev 54708)
@@ -166,7 +166,7 @@
 	/* initial position for draw the text. */
 	float pos[3];
 
-	/* angle in degrees. */
+	/* angle in radians. */
 	float angle;
 	
 	/* blur: 3 or 5 large kernel */

Modified: trunk/blender/source/blender/editors/interface/view2d.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d.c	2013-02-21 17:14:27 UTC (rev 54707)
+++ trunk/blender/source/blender/editors/interface/view2d.c	2013-02-21 17:15:19 UTC (rev 54708)
@@ -1805,7 +1805,7 @@
 			/* draw vertical steps */
 			if (dfac > 0.0f) {
 				
-				BLF_rotation_default(90.0f);
+				BLF_rotation_default(M_PI / 2);
 				BLF_enable_default(BLF_ROTATION);
 
 				for (; fac < vert.ymax - 10; fac += dfac, val += grid->dy) {




More information about the Bf-blender-cvs mailing list