Merge master to soc-2019-cycles-procedural.soc-2019-cycles-procedural

1 files changed, 6 insertions, 6 deletions

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);
   }
 }