diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-08-06 20:21:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-08-06 20:38:01 +0300 |
commit | 00cb31de6577f79adb26c08a3fdef7186e17e237 (patch) | |
tree | 29f44f5c8bc85215ea85f69df9e2866487f66ccc /source/blender/render/intern | |
parent | e2630f388d6f8c1eb8663300cf81244600c9ad39 (diff) |
Cleanup: use BKE_ prefix for BKE_colortools.h
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 6 | ||||
-rw-r--r-- | source/blender/render/intern/source/pointdensity.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 8764671ae04..d620cd38b76 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -642,7 +642,7 @@ void RE_FreeRender(Render *re) BLI_freelistN(&re->view_layers); BLI_freelistN(&re->r.views); - curvemapping_free_data(&re->r.mblur_shutter_curve); + BKE_curvemapping_free_data(&re->r.mblur_shutter_curve); /* main dbase can already be invalid now, some database-free code checks it */ re->main = NULL; @@ -772,12 +772,12 @@ static void re_init_resolution(Render *re, Render *source, int winx, int winy, r void render_copy_renderdata(RenderData *to, RenderData *from) { BLI_freelistN(&to->views); - curvemapping_free_data(&to->mblur_shutter_curve); + BKE_curvemapping_free_data(&to->mblur_shutter_curve); *to = *from; BLI_duplicatelist(&to->views, &from->views); - curvemapping_copy_data(&to->mblur_shutter_curve, &from->mblur_shutter_curve); + BKE_curvemapping_copy_data(&to->mblur_shutter_curve, &from->mblur_shutter_curve); } /* what doesn't change during entire render sequence */ diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c index 75ddf7e0b22..3ede55434b9 100644 --- a/source/blender/render/intern/source/pointdensity.c +++ b/source/blender/render/intern/source/pointdensity.c @@ -557,8 +557,8 @@ static float density_falloff(PointDensityRangeData *pdr, int index, float square } if (pdr->density_curve && dist != 0.0f) { - curvemapping_initialize(pdr->density_curve); - density = curvemapping_evaluateF(pdr->density_curve, 0, density / dist) * dist; + BKE_curvemapping_initialize(pdr->density_curve); + density = BKE_curvemapping_evaluateF(pdr->density_curve, 0, density / dist) * dist; } return density; |