svn merge -r40279:40295 ^/trunk/blender

[blender-staging.git] / source / blender / editors / space_view3d / view3d_buttons.c

diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index ec3e6ea93bdef1db67f4e49654295d2d77a79f1f..d2cb2a6c46f76baec1005060c2a1a2fe9893f189 100644 (file)
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -900,9 +900,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);
@@ -1110,9 +1110,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];