diff options
| author | Joshua Leung <aligorith@gmail.com> | 2007-08-23 13:42:21 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2007-08-23 13:42:21 +0400 |
| commit | 6ab498defc9585fdd8819ff26391055eac7b5b2c (patch) | |
| tree | b6cc83adf4de3baf0caf667676df74f0097bf186 /source/blender/blenkernel | |
| parent | 866218eb15f3ed7beb71f461ee0de051abc398a5 (diff) | |
Several Minor Fixes:
* Grouped Up/Down buttons in constraint panel headers, and fixed their tooltips
* Removed unused variable from action editor code
* Minor formatting in constraint.c
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 5ed729fbd37..38f067f53ab 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -2126,7 +2126,7 @@ static void evaluate_constraint (bConstraint *constraint, float ownermat[][4], f VecSubf(totmat[0], vec, vec2); Normalize(totmat[0]); VecMulf(totmat[0],-1); - + /* the y axis is fixed */ totmat[1][0] = ownermat[1][0]; totmat[1][1] = ownermat[1][1]; @@ -2144,7 +2144,7 @@ static void evaluate_constraint (bConstraint *constraint, float ownermat[][4], f VecSubf(totmat[2], vec, vec2); Normalize(totmat[2]); VecMulf(totmat[2],-1); - + /* the y axis is fixed */ totmat[1][0] = ownermat[1][0]; totmat[1][1] = ownermat[1][1]; @@ -2268,19 +2268,18 @@ static void evaluate_constraint (bConstraint *constraint, float ownermat[][4], f totmat[0][0] = tmpmat[0][0];totmat[0][1] = tmpmat[0][1];totmat[0][2] = tmpmat[0][2]; totmat[1][0] = tmpmat[1][0];totmat[1][1] = tmpmat[1][1];totmat[1][2] = tmpmat[1][2]; totmat[2][0] = tmpmat[2][0];totmat[2][1] = tmpmat[2][1];totmat[2][2] = tmpmat[2][2]; - + Mat4CpyMat4(tmat, ownermat); - + mdet = Det3x3( totmat[0][0],totmat[0][1],totmat[0][2], totmat[1][0],totmat[1][1],totmat[1][2], totmat[2][0],totmat[2][1],totmat[2][2]); - if (mdet==0) - { + if (mdet==0) { totmat[0][0] = 1;totmat[0][1] = 0;totmat[0][2] = 0; totmat[1][0] = 0;totmat[1][1] = 1;totmat[1][2] = 0; totmat[2][0] = 0;totmat[2][1] = 0;totmat[2][2] = 1; } - + /* apply out transformaton to the object */ Mat4MulMat34(ownermat, totmat, tmat); } @@ -2349,7 +2348,7 @@ static void evaluate_constraint (bConstraint *constraint, float ownermat[][4], f //dist = VecLenf( ob->obmat[3], targetmat[3]); if (data->orglength == 0) data->orglength = dist; - if (data->bulge ==0) data->bulge = 1.0; + if (data->bulge == 0) data->bulge = 1.0; scale[1] = dist/data->orglength; switch (data->volmode) { |