diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-12-07 15:53:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-12-07 15:53:03 +0300 |
| commit | 1c7cfa025c87e8f31790b48cbb189949f7949ad1 (patch) | |
| tree | 3869d475a9d10c005b0bb8006eb77bf55f1903d3 /source/blender/makesrna/intern/rna_color.c | |
| parent | 46f518e92790a04885f4e047bb59b11019d73aa3 (diff) | |
| parent | 2e2e6e3bdb694e56fcd161f06b6751e953cd2fa1 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_color.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_color.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index ad2586635c9..d9b7a58de04 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -52,12 +52,12 @@ #include "MEM_guardedalloc.h" +#include "BKE_colorband.h" #include "BKE_colortools.h" #include "BKE_image.h" #include "BKE_movieclip.h" #include "BKE_node.h" #include "BKE_sequencer.h" -#include "BKE_texture.h" #include "BKE_linestyle.h" #include "DEG_depsgraph.h" @@ -362,12 +362,12 @@ static void rna_ColorRamp_update(Main *bmain, Scene *UNUSED(scene), PointerRNA * static void rna_ColorRamp_eval(struct ColorBand *coba, float position, float color[4]) { - do_colorband(coba, position, color); + BKE_colorband_evaluate(coba, position, color); } static CBData *rna_ColorRampElement_new(struct ColorBand *coba, ReportList *reports, float position) { - CBData *element = colorband_element_add(coba, position); + CBData *element = BKE_colorband_element_add(coba, position); if (element == NULL) BKE_reportf(reports, RPT_ERROR, "Unable to add element to colorband (limit %d)", MAXCOLORBAND); @@ -379,7 +379,7 @@ static void rna_ColorRampElement_remove(struct ColorBand *coba, ReportList *repo { CBData *element = element_ptr->data; int index = (int)(element - coba->data); - if (colorband_element_remove(coba, index) == false) { + if (BKE_colorband_element_remove(coba, index) == false) { BKE_report(reports, RPT_ERROR, "Element not found in element collection or last element"); return; } |