diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-11-01 14:09:55 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-11-27 18:05:54 +0300 |
| commit | 2e6159a4948cd0f4e0b636734bfe506796bd87f2 (patch) | |
| tree | fb04244033e45a69c514ec9a0ac6aa6fd28d5a33 /source/blender/blenkernel/BKE_colortools.h | |
| parent | 6992fc0b3bf85e985169157b2e7ced1e1ed7fcdf (diff) | |
Curve: CurveMapping Extend Option
Extend options are currently stored per curve. This was not clearly
communicated to the user and they expected this to be a setting per
CurveMapping.
This change will move the option from `Curve` to `CurveMapping`. In
order to support this the API had to be changed.
BPY: CurveMap.evaluate is also moved to CurveMapping.evaluate what
breaks Python API. Cycles has been updated but other add-ons have
not. After release of 2.81 we can merge this to master and adapt
the add-ons.
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D6169
Diffstat (limited to 'source/blender/blenkernel/BKE_colortools.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_colortools.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h index 643073b3470..e4ea1dad086 100644 --- a/source/blender/blenkernel/BKE_colortools.h +++ b/source/blender/blenkernel/BKE_colortools.h @@ -68,7 +68,9 @@ void BKE_curvemapping_initialize(struct CurveMapping *cumap); /* keep these (const CurveMap) - to help with thread safety */ /* single curve, no table check */ -float BKE_curvemap_evaluateF(const struct CurveMap *cuma, float value); +float BKE_curvemap_evaluateF(const struct CurveMapping *cumap, + const struct CurveMap *cuma, + float value); /* single curve, with table check */ float BKE_curvemapping_evaluateF(const struct CurveMapping *cumap, int cur, float value); void BKE_curvemapping_evaluate3F(const struct CurveMapping *cumap, |