svn merge -r40279:40295 ^/trunk/blender
[blender-staging.git] / source / blender / blenkernel / intern / constraint.c
index e847e0961effaa16f85271f6e7444cb9b63f009e..7472e03d6d1847602423872d2f3f3fde2e339267 100644 (file)
@@ -2167,7 +2167,7 @@ static void actcon_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstraint
                if (data->type < 10) {
                        /* extract rotation (is in whatever space target should be in) */
                        mat4_to_eul(vec, tempmat);
-                       mul_v3_fl(vec, (float)(180.0/M_PI)); /* rad -> deg */
+                       mul_v3_fl(vec, RAD2DEGF(1.0f)); /* rad -> deg */
                        axis= data->type;
                }
                else if (data->type < 20) {
@@ -3325,7 +3325,7 @@ static void transform_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *
                                break;
                        case 1: /* rotation (convert to degrees first) */
                                mat4_to_eulO(dvec, cob->rotOrder, ct->matrix);
-                               mul_v3_fl(dvec, (float)(180.0/M_PI)); /* rad -> deg */
+                               mul_v3_fl(dvec, RAD2DEGF(1.0f)); /* rad -> deg */
                                break;
                        default: /* location */
                                copy_v3_v3(dvec, ct->matrix[3]);