1 files changed, 23 insertions, 28 deletions

diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index 4f4eb8f9f9d..116d8b1a82f 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -603,28 +603,24 @@ static float curvemap_calc_extend(const CurveMapping *cumap,
       /* extrapolate horizontally */
       return first[1];
     }
-    else {
-      if (cuma->ext_in[0] == 0.0f) {
-        return first[1] + cuma->ext_in[1] * 10000.0f;
-      }
-      else {
-        return first[1] + cuma->ext_in[1] * (x - first[0]) / cuma->ext_in[0];
-      }
+
+    if (cuma->ext_in[0] == 0.0f) {
+      return first[1] + cuma->ext_in[1] * 10000.0f;
     }
+
+    return first[1] + cuma->ext_in[1] * (x - first[0]) / cuma->ext_in[0];
   }
-  else if (x >= last[0]) {
+  if (x >= last[0]) {
     if ((cumap->flag & CUMA_EXTEND_EXTRAPOLATE) == 0) {
       /* extrapolate horizontally */
       return last[1];
     }
-    else {
-      if (cuma->ext_out[0] == 0.0f) {
-        return last[1] - cuma->ext_out[1] * 10000.0f;
-      }
-      else {
-        return last[1] + cuma->ext_out[1] * (x - last[0]) / cuma->ext_out[0];
-      }
+
+    if (cuma->ext_out[0] == 0.0f) {
+      return last[1] - cuma->ext_out[1] * 10000.0f;
     }
+
+    return last[1] + cuma->ext_out[1] * (x - last[0]) / cuma->ext_out[0];
   }
   return 0.0f;
 }
@@ -728,14 +724,14 @@ static void curvemap_make_table(const CurveMapping *cumap, CurveMap *cuma)
                                   bezt[a + 1].vec[1][0],
                                   point,
                                   CM_RESOL - 1,
-                                  2 * sizeof(float));
+                                  sizeof(float[2]));
     BKE_curve_forward_diff_bezier(bezt[a].vec[1][1],
                                   bezt[a].vec[2][1],
                                   bezt[a + 1].vec[0][1],
                                   bezt[a + 1].vec[1][1],
                                   point + 1,
                                   CM_RESOL - 1,
-                                  2 * sizeof(float));
+                                  sizeof(float[2]));
   }
 
   /* store first and last handle for extrapolation, unit length */
@@ -870,7 +866,7 @@ static int sort_curvepoints(const void *a1, const void *a2)
   if (x1->x > x2->x) {
     return 1;
   }
-  else if (x1->x < x2->x) {
+  if (x1->x < x2->x) {
     return -1;
   }
   return 0;
@@ -984,17 +980,16 @@ float BKE_curvemap_evaluateF(const CurveMapping *cumap, const CurveMap *cuma, fl
   if (fi < 0.0f || fi > CM_TABLE) {
     return curvemap_calc_extend(cumap, cuma, value, &cuma->table[0].x, &cuma->table[CM_TABLE].x);
   }
-  else {
-    if (i < 0) {
-      return cuma->table[0].y;
-    }
-    if (i >= CM_TABLE) {
-      return cuma->table[CM_TABLE].y;
-    }
 
-    fi = fi - (float)i;
-    return (1.0f - fi) * cuma->table[i].y + (fi)*cuma->table[i + 1].y;
+  if (i < 0) {
+    return cuma->table[0].y;
   }
+  if (i >= CM_TABLE) {
+    return cuma->table[CM_TABLE].y;
+  }
+
+  fi = fi - (float)i;
+  return (1.0f - fi) * cuma->table[i].y + (fi)*cuma->table[i + 1].y;
 }
 
 /* works with curve 'cur' */
@@ -1202,7 +1197,7 @@ int BKE_curvemapping_RGBA_does_something(const CurveMapping *cumap)
   return 0;
 }
 
-void BKE_curvemapping_initialize(CurveMapping *cumap)
+void BKE_curvemapping_init(CurveMapping *cumap)
 {
   int a;