griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bugfix #8948: Transformation constraint - destination rotation is in radians

Browse Source 
Unfortunately, my previous fixes here to get gears working resulted in this problem. The flip side of that was that gears worked for quite a few cases. 

Alas, it is not to be... The bug is now fixed, but gears no longer work any more. Sadly, there is not much I can do about this.
This commit is contained in:
Joshua Leung
2008-04-16 07:33:54 +00:00
parent 190c18a62a
commit 6b2a65a3b6
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/blenkernel/intern/constraint.c
View File

@@ -3178,12 +3178,6 @@ static void transform_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *
}
}
/* convert radians<->degrees */
if (data->to == 1) {
/* if output is rotation, convert to radians from degrees */
for (i=0; i<3; i++)
sval[i] = sval[i] / 180 * M_PI;
}
/* apply transforms */
switch (data->to) {
@@ -3195,11 +3189,14 @@ static void transform_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *
for (i=0; i<3; i++) {
float tmin, tmax;
/* convert destination min/max ranges from degrees to radians */
tmin= data->to_min[i] / M_PI * 180;
tmax= data->to_max[i] / M_PI * 180;
tmin= data->to_min[i];
tmax= data->to_max[i];
/* all values here should be in degrees */
eul[i]= tmin + (sval[data->map[i]] * (tmax - tmin));
/* now convert final value back to radians */
eul[i] = eul[i] / 180 * M_PI;
}
break;
default: /* location */

2
source/blender/src/buttons_object.c
View File

@@ -1645,7 +1645,7 @@ static void draw_constraint (uiBlock *block, ListBase *list, bConstraint *con, s
uiBlockEndAlign(block);
/* Extrapolate Ranges? */
uiDefButBitC(block, TOG, 1, B_CONSTRAINT_TEST, "Extrapolate", *xco, *yco-42,80,19, &data->expo, 0, 0, 0, 0, "Extrapolate ranges");
uiDefButBitC(block, TOG, 1, B_CONSTRAINT_TEST, "Extrapolate", *xco-10, *yco-42,80,19, &data->expo, 0, 0, 0, 0, "Extrapolate ranges");
/* Draw options for source motion */
uiDefBut(block, LABEL, B_CONSTRAINT_TEST, "Source:", *xco-10, *yco-62, 50, 18, NULL, 0.0, 0.0, 0.0, 0.0, "");