From 00cb31de6577f79adb26c08a3fdef7186e17e237 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 7 Aug 2019 03:21:55 +1000
Subject: Cleanup: use BKE_ prefix for BKE_colortools.h

---
 source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c  | 12 ++++++------
 source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'source/blender/gpencil_modifiers')

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
index d56b3217c9f..a3dbcdf23de 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
@@ -81,9 +81,9 @@ static void initData(GpencilModifierData *md)
   gpmd->object = NULL;
   gpmd->force = 0.5f;
   gpmd->falloff_type = eGPHook_Falloff_Smooth;
-  gpmd->curfalloff = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+  gpmd->curfalloff = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
   if (gpmd->curfalloff) {
-    curvemapping_initialize(gpmd->curfalloff);
+    BKE_curvemapping_initialize(gpmd->curfalloff);
   }
 }
 
@@ -93,13 +93,13 @@ static void copyData(const GpencilModifierData *md, GpencilModifierData *target)
   HookGpencilModifierData *tgmd = (HookGpencilModifierData *)target;
 
   if (tgmd->curfalloff != NULL) {
-    curvemapping_free(tgmd->curfalloff);
+    BKE_curvemapping_free(tgmd->curfalloff);
     tgmd->curfalloff = NULL;
   }
 
   BKE_gpencil_modifier_copyData_generic(md, target);
 
-  tgmd->curfalloff = curvemapping_copy(gmd->curfalloff);
+  tgmd->curfalloff = BKE_curvemapping_copy(gmd->curfalloff);
 }
 
 /* calculate factor of fallof */
@@ -126,7 +126,7 @@ static float gp_hook_falloff(const struct GPHookData_cb *tData, const float len_
 
     switch (tData->falloff_type) {
       case eGPHook_Falloff_Curve:
-        fac = curvemapping_evaluateF(tData->curfalloff, 0, fac);
+        fac = BKE_curvemapping_evaluateF(tData->curfalloff, 0, fac);
         break;
       case eGPHook_Falloff_Sharp:
         fac = fac * fac;
@@ -301,7 +301,7 @@ static void freeData(GpencilModifierData *md)
   HookGpencilModifierData *mmd = (HookGpencilModifierData *)md;
 
   if (mmd->curfalloff) {
-    curvemapping_free(mmd->curfalloff);
+    BKE_curvemapping_free(mmd->curfalloff);
   }
 }
 
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
index bf4f45b10af..357e36a06b2 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
@@ -48,9 +48,9 @@ static void initData(GpencilModifierData *md)
   gpmd->thickness = 2;
   gpmd->layername[0] = '\0';
   gpmd->vgname[0] = '\0';
-  gpmd->curve_thickness = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+  gpmd->curve_thickness = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
   if (gpmd->curve_thickness) {
-    curvemapping_initialize(gpmd->curve_thickness);
+    BKE_curvemapping_initialize(gpmd->curve_thickness);
   }
 }
 
@@ -59,7 +59,7 @@ static void freeData(GpencilModifierData *md)
   ThickGpencilModifierData *gpmd = (ThickGpencilModifierData *)md;
 
   if (gpmd->curve_thickness) {
-    curvemapping_free(gpmd->curve_thickness);
+    BKE_curvemapping_free(gpmd->curve_thickness);
   }
 }
 
@@ -69,13 +69,13 @@ static void copyData(const GpencilModifierData *md, GpencilModifierData *target)
   ThickGpencilModifierData *tgmd = (ThickGpencilModifierData *)target;
 
   if (tgmd->curve_thickness != NULL) {
-    curvemapping_free(tgmd->curve_thickness);
+    BKE_curvemapping_free(tgmd->curve_thickness);
     tgmd->curve_thickness = NULL;
   }
 
   BKE_gpencil_modifier_copyData_generic(md, target);
 
-  tgmd->curve_thickness = curvemapping_copy(gmd->curve_thickness);
+  tgmd->curve_thickness = BKE_curvemapping_copy(gmd->curve_thickness);
 }
 
 /* change stroke thickness */
@@ -125,7 +125,7 @@ static void deformStroke(GpencilModifierData *md,
       if ((mmd->flag & GP_THICK_CUSTOM_CURVE) && (mmd->curve_thickness)) {
         /* normalize value to evaluate curve */
         float value = (float)i / (gps->totpoints - 1);
-        curvef = curvemapping_evaluateF(mmd->curve_thickness, 0, value);
+        curvef = BKE_curvemapping_evaluateF(mmd->curve_thickness, 0, value);
       }
 
       pt->pressure += mmd->thickness * weight * curvef;
-- 
cgit v1.2.3