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/editors/interface/interface_draw.c | |
| 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/editors/interface/interface_draw.c')
| -rw-r--r-- | source/blender/editors/interface/interface_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 499842a570b..31cbd2a3831 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -2019,7 +2019,7 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, const uiWidgetColors *wcol, cons rctf line_range; /* First curve point. */ - if ((cuma->flag & CUMA_EXTEND_EXTRAPOLATE) == 0) { + if ((cumap->flag & CUMA_EXTEND_EXTRAPOLATE) == 0) { line_range.xmin = rect->xmin; line_range.ymin = rect->ymin + zoomy * (cmp[0].y - offsy); } @@ -2028,7 +2028,7 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, const uiWidgetColors *wcol, cons line_range.ymin = rect->ymin + zoomy * (cmp[0].y - offsy + cuma->ext_in[1]); } /* Last curve point. */ - if ((cuma->flag & CUMA_EXTEND_EXTRAPOLATE) == 0) { + if ((cumap->flag & CUMA_EXTEND_EXTRAPOLATE) == 0) { line_range.xmax = rect->xmax; line_range.ymax = rect->ymin + zoomy * (cmp[CM_TABLE].y - offsy); } |