diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-09-11 07:00:09 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-09-11 07:00:09 +0400 |
commit | 2b5f89ed9f66292e3f6736c85d91b85a3c709210 (patch) | |
tree | 4f370afe8547479dfe62ec3fa38cc25e5c030ac2 /source/blender/blenkernel/intern/colortools.c | |
parent | fc11700628b56d77cfd57c35c04e07e00d46b10e (diff) | |
parent | 2fc4ee354574d52200544eec00aed95442cf4d04 (diff) |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r23043:23119
Diffstat (limited to 'source/blender/blenkernel/intern/colortools.c')
-rw-r--r-- | source/blender/blenkernel/intern/colortools.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c index 26f9245abc7..8cd64ae2ece 100644 --- a/source/blender/blenkernel/intern/colortools.c +++ b/source/blender/blenkernel/intern/colortools.c @@ -502,8 +502,8 @@ static void curvemap_make_table(CurveMap *cuma, rctf *clipr) for(a=0; a<cuma->totpoint-1; a++, fp += 2*CM_RESOL) { correct_bezpart(bezt[a].vec[1], bezt[a].vec[2], bezt[a+1].vec[0], bezt[a+1].vec[1]); - forward_diff_bezier(bezt[a].vec[1][0], bezt[a].vec[2][0], bezt[a+1].vec[0][0], bezt[a+1].vec[1][0], fp, CM_RESOL-1, 2); - forward_diff_bezier(bezt[a].vec[1][1], bezt[a].vec[2][1], bezt[a+1].vec[0][1], bezt[a+1].vec[1][1], fp+1, CM_RESOL-1, 2); + forward_diff_bezier(bezt[a].vec[1][0], bezt[a].vec[2][0], bezt[a+1].vec[0][0], bezt[a+1].vec[1][0], fp, CM_RESOL-1, 2*sizeof(float)); + forward_diff_bezier(bezt[a].vec[1][1], bezt[a].vec[2][1], bezt[a+1].vec[0][1], bezt[a+1].vec[1][1], fp+1, CM_RESOL-1, 2*sizeof(float)); } /* store first and last handle for extrapolation, unit length */ |