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

1 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.cpp b/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
index e25ef49cf28..90d3a60abd0 100644
--- a/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
+++ b/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
@@ -50,7 +50,7 @@ void ColorCurveOperation::initExecution()
   this->m_inputBlackProgram = this->getInputSocketReader(2);
   this->m_inputWhiteProgram = this->getInputSocketReader(3);
 
-  curvemapping_premultiply(this->m_curveMapping, 0);
+  BKE_curvemapping_premultiply(this->m_curveMapping, 0);
 }
 
 void ColorCurveOperation::executePixelSampled(float output[4],
@@ -73,20 +73,20 @@ void ColorCurveOperation::executePixelSampled(float output[4],
 
   /* get our own local bwmul value,
    * since we can't be threadsafe and use cumap->bwmul & friends */
-  curvemapping_set_black_white_ex(black, white, bwmul);
+  BKE_curvemapping_set_black_white_ex(black, white, bwmul);
 
   this->m_inputFacProgram->readSampled(fac, x, y, sampler);
   this->m_inputImageProgram->readSampled(image, x, y, sampler);
 
   if (*fac >= 1.0f) {
-    curvemapping_evaluate_premulRGBF_ex(cumap, output, image, black, bwmul);
+    BKE_curvemapping_evaluate_premulRGBF_ex(cumap, output, image, black, bwmul);
   }
   else if (*fac <= 0.0f) {
     copy_v3_v3(output, image);
   }
   else {
     float col[4];
-    curvemapping_evaluate_premulRGBF_ex(cumap, col, image, black, bwmul);
+    BKE_curvemapping_evaluate_premulRGBF_ex(cumap, col, image, black, bwmul);
     interp_v3_v3v3(output, image, col, *fac);
   }
   output[3] = image[3];
@@ -120,9 +120,9 @@ void ConstantLevelColorCurveOperation::initExecution()
   this->m_inputFacProgram = this->getInputSocketReader(0);
   this->m_inputImageProgram = this->getInputSocketReader(1);
 
-  curvemapping_premultiply(this->m_curveMapping, 0);
+  BKE_curvemapping_premultiply(this->m_curveMapping, 0);
 
-  curvemapping_set_black_white(this->m_curveMapping, this->m_black, this->m_white);
+  BKE_curvemapping_set_black_white(this->m_curveMapping, this->m_black, this->m_white);
 }
 
 void ConstantLevelColorCurveOperation::executePixelSampled(float output[4],
@@ -137,14 +137,14 @@ void ConstantLevelColorCurveOperation::executePixelSampled(float output[4],
   this->m_inputImageProgram->readSampled(image, x, y, sampler);
 
   if (*fac >= 1.0f) {
-    curvemapping_evaluate_premulRGBF(this->m_curveMapping, output, image);
+    BKE_curvemapping_evaluate_premulRGBF(this->m_curveMapping, output, image);
   }
   else if (*fac <= 0.0f) {
     copy_v3_v3(output, image);
   }
   else {
     float col[4];
-    curvemapping_evaluate_premulRGBF(this->m_curveMapping, col, image);
+    BKE_curvemapping_evaluate_premulRGBF(this->m_curveMapping, col, image);
     interp_v3_v3v3(output, image, col, *fac);
   }
   output[3] = image[3];