-removed BKE prefix from static function
-removed extra points from array, moved to stack
-made offset of pre and post points dynamic to match table range
-combiend declarations and initializations
-made condition explicit for clarity

@@ -638,2 +643,4 @@
 }
 
+/* Evaluate a point on a curve, given two bezier triples */
+static void BKE_curve_eval_bezier_point(float bezt1[3][3], float bezt2[3][3], float *point)

@@ -654,3 +675,3 @@
 
   /* Rely on Blender interpolation for bezier curves, support extra functionality here as well. */
-  bezt = static_cast<BezTriple *>(MEM_callocN(cuma->totpoint * sizeof(BezTriple), "beztarr"));
+  int bezt_count = cuma->totpoint;

@@ -674,1 +696,4 @@
+  const BezTriple *bezt_next = nullptr;
   const BezTriple *bezt_prev = nullptr;
+
+  /* Create two extra points for wrapping curves. */

@@ -675,0 +705,4 @@
+  if (use_wrapping) {
+    /* Handle location of pre and post points for wrapping curves. */
+    bezt_pre->h1 = bezt_pre->h2 = bezt[cuma->totpoint - 1].h2;
+    bezt_pre->vec[1][0] = bezt[cuma->totpoint - 1].vec[1][0] - 1.0f;

@@ -727,3 +788,1 @@
-  int totpoint = (cuma->totpoint - 1) * CM_RESOL;
-  float *allpoints = static_cast<float *>(MEM_callocN(totpoint * 2 * sizeof(float), "table"));
-  float *point = allpoints;
+  int totpoint;

@@ -765,0 +809,4 @@
+    /* Handle post point for wrapping */
+    BKE_curve_eval_bezier_point(bezt[cuma->totpoint - 1].vec, bezt_post->vec, point);
+  }
+  else {

@@ -655,2 +687,3 @@
   /* Rely on Blender interpolation for bezier curves, support extra functionality here as well. */
-  bezt = static_cast<BezTriple *>(MEM_callocN(cuma->totpoint * sizeof(BezTriple), "beztarr"));
+  int bezt_count = cuma->totpoint;
+  bezt = static_cast<BezTriple *>(MEM_callocN((bezt_count) * sizeof(BezTriple), "beztarr"));

@@ -788,3 +859,2 @@
-
     /* Check if we are on or outside the start or end point. */
-    if (point == firstpoint || (point == lastpoint && cur_x >= point[0])) {
+    if ((point == firstpoint || (point == lastpoint && cur_x >= point[0])) && not use_wrapping) {

@@ -100,12 +101,13 @@ typedef enum eCurveMappingPreset {
   CURVE_PRESET_SHARP = 1,
   CURVE_PRESET_SMOOTH = 2,
   CURVE_PRESET_MAX = 3,
-  CURVE_PRESET_MID9 = 4,

@@ -637,12 +642,28 @@ static float curvemap_calc_extend(const CurveMapping *cumap,
   return 0.0f;
 }
 
+/* Evaluate a point on a curve, given two bezier triples */

@@ -643,3 +663,4 @@
   const rctf *clipr = &cumap->clipr;
   CurveMapPoint *cmp = cuma->curve;
   BezTriple *bezt;
+  const bool use_wrapping = cuma->use_wrapping;

@@ -765,0 +805,4 @@
+    /* Handle post point for wrapping */
+    curve_eval_bezier_point(bezt[cuma->totpoint - 1].vec, bezt_post.vec, point);
+  }
+  if (!use_wrapping) {

@@ -59,2 +59,3 @@
   short default_handle_type;
-  char _pad[6];
+  char _pad[2];
+  int use_wrapping;

@@ -644,6 +660,14 @@ static void curvemap_make_table(const CurveMapping *cumap, CurveMap *cuma)
   CurveMapPoint *cmp = cuma->curve;
   BezTriple *bezt;
 
+  /*

@@ -751,0 +808,4 @@
+    /* Handle post point for wrapping */
+    curve_eval_bezier_point(bezt[cuma->totpoint - 1].vec, bezt_post.vec, point);
+  }
+  /* store first and last handle for extrapolation, unit length

@@ -171,0 +172,4 @@
+/**
+ * Set the wrapping mode for the curve map.
+ */
+void BKE_curvemap_set_wrapping(CurveMapping *cumap, bool use_wrapping);

@@ -1413,3 +1473,3 @@
   hist->x_resolution = 256;
   hist->xmax = 1.0f;
-  // hist->ymax = 1.0f; /* now do this on the operator _only_ */
+  /* hist->ymax = 1.0f; /* now do this on the operator _only_ */

@@ -81,3 +81,3 @@
 
   short tone;
-  char _pad[6];
+  char use_wrapping;