use macros RAD2DEG & DEG2RAD rather then multiplying by 180.0/M_PI or M_PI/180.0

7 files changed, 29 insertions, 31 deletions

diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c
index 70974386917..d2b1fcc4abd 100644
--- a/source/blender/editors/animation/anim_draw.c
+++ b/source/blender/editors/animation/anim_draw.c
@@ -404,9 +404,9 @@ float ANIM_unit_mapping_get_factor (Scene *scene, ID *id, FCurve *fcu, short res
 				/* if the radians flag is not set, default to using degrees which need conversions */
 				if ((scene) && (scene->unit.system_rotation == USER_UNIT_ROT_RADIANS) == 0) {
 					if (restore)
-						return M_PI / 180.0;	/* degrees to radians */
+						return DEG2RADF(1.0f);	/* degrees to radians */
 					else
-						return 180.0 / M_PI;	/* radians to degrees */
+						return RAD2DEGF(1.0f);	/* radians to degrees */
 				}
 			}
 			
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index a4b1e9a6e2c..eafe65b4492 100644
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -361,7 +361,7 @@ static void fix_bonelist_roll (ListBase *bonelist, ListBase *editbonelist)
 			print_m4("premat", premat);
 			print_m4("postmat", postmat);
 			print_m4("difmat", difmat);
-			printf ("Roll = %f\n",  (-atan2(difmat[2][0], difmat[2][2]) * (180.0/M_PI)));
+			printf ("Roll = %f\n",  RAD2DEGF(-atan2(difmat[2][0], difmat[2][2])));
 #endif
 			curBone->roll = (float)-atan2(difmat[2][0], difmat[2][2]);
 			
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index 33aeb2df926..8889c419c35 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -959,13 +959,13 @@ static float polar_to_y(float center, float diam, float ampli, float angle)
 	return center + diam * ampli * sinf(angle);
 }
 
-static void vectorscope_draw_target(float centerx, float centery, float diam, float r, float g, float b)
+static void vectorscope_draw_target(float centerx, float centery, float diam, const float colf[3])
 {
 	float y,u,v;
 	float tangle=0.f, tampli;
 	float dangle, dampli, dangle2, dampli2;
 
-	rgb_to_yuv(r,g,b, &y, &u, &v);
+	rgb_to_yuv(colf[0], colf[1], colf[2], &y, &u, &v);
 	if (u>0 && v>=0) tangle=atanf(v/u);
 	else if (u>0 && v<0) tangle= atanf(v/u) + 2.0f * (float)M_PI;
 	else if (u<0) tangle=atanf(v/u) + (float)M_PI;
@@ -975,7 +975,7 @@ static void vectorscope_draw_target(float centerx, float centery, float diam, fl
 
 	/* small target vary by 2.5 degree and 2.5 IRE unit */
 	glColor4f(1.0f, 1.0f, 1.0, 0.12f);
-	dangle= 2.5f*(float)M_PI/180.0f;
+	dangle= DEG2RADF(2.5f);
 	dampli= 2.5f/200.0f;
 	glBegin(GL_LINE_STRIP);
 	glVertex2f(polar_to_x(centerx,diam,tampli+dampli,tangle+dangle), polar_to_y(centery,diam,tampli+dampli,tangle+dangle));
@@ -986,9 +986,9 @@ static void vectorscope_draw_target(float centerx, float centery, float diam, fl
 	glEnd();
 	/* big target vary by 10 degree and 20% amplitude */
 	glColor4f(1.0f, 1.0f, 1.0, 0.12f);
-	dangle= 10.0f*(float)M_PI/180.0f;
+	dangle= DEG2RADF(10.0f);
 	dampli= 0.2f*tampli;
-	dangle2= 5.0f*(float)M_PI/180.0f;
+	dangle2= DEG2RADF(5.0f);
 	dampli2= 0.5f*dampli;
 	glBegin(GL_LINE_STRIP);
 	glVertex2f(polar_to_x(centerx,diam,tampli+dampli-dampli2,tangle+dangle), polar_to_y(centery,diam,tampli+dampli-dampli2,tangle+dangle));
@@ -1014,13 +1014,13 @@ static void vectorscope_draw_target(float centerx, float centery, float diam, fl
 
 void ui_draw_but_VECTORSCOPE(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol), rcti *recti)
 {
+	const float skin_rad= DEG2RADF(123.0f); /* angle in radians of the skin tone line */
 	Scopes *scopes = (Scopes *)but->poin;
 	rctf rect;
 	int i, j;
-	int skina= 123; /* angle in degree of the skin tone line */
 	float w, h, centerx, centery, diam;
 	float alpha;
-	float colors[6][3]={{.75,0,0},{.75,.75,0},{0,.75,0},{0,.75,.75},{0,0,.75},{.75,0,.75}};
+	const float colors[6][3]={{.75,0,0},{.75,.75,0},{0,.75,0},{0,.75,.75},{0,0,.75},{.75,0,.75}};
 	GLint scissor[4];
 	
 	rect.xmin = (float)recti->xmin+1;
@@ -1056,19 +1056,19 @@ void ui_draw_but_VECTORSCOPE(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wco
 	for(j=0; j<5; j++) {
 		glBegin(GL_LINE_STRIP);
 		for(i=0; i<=360; i=i+15) {
-			float a= i*M_PI/180.0;
-			float r= (j+1)/10.0f;
-			glVertex2f( polar_to_x(centerx,diam,r,a), polar_to_y(centery,diam,r,a));
+			const float a= DEG2RADF((float)i);
+			const float r= (j+1)/10.0f;
+			glVertex2f(polar_to_x(centerx,diam,r,a), polar_to_y(centery,diam,r,a));
 		}
 		glEnd();
 	}
 	/* skin tone line */
 	glColor4f(1.f, 0.4f, 0.f, 0.2f);
-	fdrawline(	polar_to_x(centerx, diam, 0.5f, skina*M_PI/180.0), polar_to_y(centery,diam,0.5,skina*M_PI/180.0),
-				polar_to_x(centerx, diam, 0.1f, skina*M_PI/180.0), polar_to_y(centery,diam,0.1,skina*M_PI/180.0));
+	fdrawline(polar_to_x(centerx, diam, 0.5f, skin_rad), polar_to_y(centery,diam,0.5,skin_rad),
+	          polar_to_x(centerx, diam, 0.1f, skin_rad), polar_to_y(centery,diam,0.1,skin_rad));
 	/* saturation points */
 	for(i=0; i<6; i++)
-		vectorscope_draw_target(centerx, centery, diam, colors[i][0], colors[i][1], colors[i][2]);
+		vectorscope_draw_target(centerx, centery, diam, colors[i]);
 	
 	if (scopes->ok && scopes->vecscope != NULL) {
 		/* pixel point cloud */
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c
index 73a6e4fad20..767001ff163 100644
--- a/source/blender/editors/sculpt_paint/paint_stroke.c
+++ b/source/blender/editors/sculpt_paint/paint_stroke.c
@@ -447,9 +447,9 @@ static void paint_draw_alpha_overlay(Sculpt *sd, Brush *brush,
 		if(brush->mtex.brush_map_mode == MTEX_MAP_MODE_FIXED) {
 			/* brush rotation */
 			glTranslatef(0.5, 0.5, 0);
-			glRotatef((double)((brush->flag & BRUSH_RAKE) ?
-				   sd->last_angle : sd->special_rotation) * (180.0/M_PI),
-				  0.0, 0.0, 1.0);
+			glRotatef((double)RAD2DEGF((brush->flag & BRUSH_RAKE) ?
+			                           sd->last_angle : sd->special_rotation),
+			                           0.0, 0.0, 1.0);
 			glTranslatef(-0.5f, -0.5f, 0);
 
 			/* scale based on tablet pressure */
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index af9c7ef3c85..0e8e6cdfee1 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -5401,8 +5401,7 @@ static void draw_forcefield(Scene *scene, Object *ob, RegionView3D *rv3d)
 
 		unit_m4(tmat);
 
-		radius=(pd->flag&PFIELD_USEMAXR)?pd->maxrad:1.0f;
-		radius*=(float)M_PI/180.0f;
+		radius= DEG2RADF((pd->flag&PFIELD_USEMAXR) ? pd->maxrad : 1.0f);
 		distance=(pd->flag&PFIELD_USEMAX)?pd->maxdist:0.0f;
 
 		if(pd->flag & (PFIELD_USEMAX|PFIELD_USEMAXR)){
@@ -5411,8 +5410,7 @@ static void draw_forcefield(Scene *scene, Object *ob, RegionView3D *rv3d)
 				drawcone(vec, distance * sinf(radius),-distance * cosf(radius),tmat);
 		}
 
-		radius=(pd->flag&PFIELD_USEMINR)?pd->minrad:1.0f;
-		radius*=(float)M_PI/180.0f;
+		radius= DEG2RADF((pd->flag&PFIELD_USEMINR) ? pd->minrad : 1.0f);
 		distance=(pd->flag&PFIELD_USEMIN)?pd->mindist:0.0f;
 
 		if(pd->flag & (PFIELD_USEMIN|PFIELD_USEMINR)){
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index 50c587194b7..6c69e816b30 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -887,9 +887,9 @@ static void v3d_posearmature_buts(uiLayout *layout, Object *ob)
 		quat_to_eul( tfp->ob_eul,pchan->quat);
 	else
 		copy_v3_v3(tfp->ob_eul, pchan->eul);
-	tfp->ob_eul[0]*= 180.0/M_PI;
-	tfp->ob_eul[1]*= 180.0/M_PI;
-	tfp->ob_eul[2]*= 180.0/M_PI;
+	tfp->ob_eul[0]*= RAD2DEGF(1.0f);
+	tfp->ob_eul[1]*= RAD2DEGF(1.0f);
+	tfp->ob_eul[2]*= RAD2DEGF(1.0f);
 	
 	uiDefBut(block, LABEL, 0, "Location:",			0, 240, 100, 20, 0, 0, 0, 0, 0, "");
 	uiBlockBeginAlign(block);
@@ -1097,9 +1097,9 @@ static void do_view3d_region_buttons(bContext *C, void *UNUSED(index), int event
 			if (!pchan) return;
 			
 			/* make a copy to eul[3], to allow TAB on buttons to work */
-			eul[0]= (float)M_PI*tfp->ob_eul[0]/180.0f;
-			eul[1]= (float)M_PI*tfp->ob_eul[1]/180.0f;
-			eul[2]= (float)M_PI*tfp->ob_eul[2]/180.0f;
+			eul[0]= DEG2RADF(tfp->ob_eul[0]);
+			eul[1]= DEG2RADF(tfp->ob_eul[1]);
+			eul[2]= DEG2RADF(tfp->ob_eul[2]);
 			
 			if (pchan->rotmode == ROT_MODE_AXISANGLE) {
 				float quat[4];
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index 453bea0969b..d5a94c9b56a 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -275,7 +275,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, EditMesh *em, MTFac
 						VECSUB2D(av4, tf_uv[2], tf_uv[3]); normalize_v2(av4);
 						
 						/* This is the correct angle however we are only comparing angles
-						 * uvang1 = 90-((angle_normalized_v2v2(av1, av2) * 180.0/M_PI)-90);*/
+						 * uvang1 = 90-((angle_normalized_v2v2(av1, av2) * RAD2DEGF(1.0f))-90);*/
 						uvang1 = angle_normalized_v2v2(av1, av2);
 						uvang2 = angle_normalized_v2v2(av2, av3);
 						uvang3 = angle_normalized_v2v2(av3, av4);
@@ -288,7 +288,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, EditMesh *em, MTFac
 						VECSUB(av4, efa->v3->co, efa->v4->co); normalize_v3(av4);
 						
 						/* This is the correct angle however we are only comparing angles
-						 * ang1 = 90-((angle_normalized_v3v3(av1, av2) * 180.0/M_PI)-90);*/
+						 * ang1 = 90-((angle_normalized_v3v3(av1, av2) * RAD2DEGF(1.0f))-90);*/
 						ang1 = angle_normalized_v3v3(av1, av2);
 						ang2 = angle_normalized_v3v3(av2, av3);
 						ang3 = angle_normalized_v3v3(av3, av4);