diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-12 04:55:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-12 05:02:09 +0300 |
| commit | 49490e5cfbeb2b0b823aa2042401891001870a6e (patch) | |
| tree | a1d32562af2dea0c336ebd3d017a387834e936cc /source/blender/blenkernel/intern/colortools.c | |
| parent | 16fc62e15f0a749d6d64e784ea048e07d6ea3397 (diff) | |
| parent | e757c4a3bec8b0e8d198531a28327332af00a9ba (diff) | |
Merge branch 'master' into blender2.8
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 60a7653cd1a..aad59e32187 100644 --- a/source/blender/blenkernel/intern/colortools.c +++ b/source/blender/blenkernel/intern/colortools.c @@ -960,8 +960,8 @@ static void curvemapping_evaluateRGBF_filmlike(const CurveMapping *cumap, float * * Use in conjunction with #curvemapping_set_black_white_ex * - * \param black Use instead of cumap->black - * \param bwmul Use instead of cumap->bwmul + * \param black: Use instead of cumap->black + * \param bwmul: Use instead of cumap->bwmul */ void curvemapping_evaluate_premulRGBF_ex( const CurveMapping *cumap, float vecout[3], const float vecin[3], |