Cleanup: Rename original curve object type enum

This commit renames enums related the "Curve" object type and ID type
to add `_LEGACY` to the end. The idea is to make our aspirations clearer
in the code and to avoid ambiguities between `CURVE` and `CURVES`.

Ref T95355

To summarize for the record, the plans are:
- In the short/medium term, replace the `Curve` object data type with
 `Curves`
- In the longer term (no immediate plans), use a proper data block for
  3D text and surfaces.

Differential Revision: https://developer.blender.org/D14114

27 files changed, 107 insertions, 101 deletions

diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 6a999cde6eb..55aba1d22c3 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -1244,7 +1244,7 @@ void BKE_pose_update_constraint_flags(bPose *pose)
         /* if we have a valid target, make sure that this will get updated on frame-change
          * (needed for when there is no anim-data for this pose)
          */
-        if ((data->tar) && (data->tar->type == OB_CURVE)) {
+        if ((data->tar) && (data->tar->type == OB_CURVES_LEGACY)) {
           pose->flag |= POSE_CONSTRAINTS_TIMEDEPEND;
         }
       }
diff --git a/source/blender/blenkernel/intern/anim_path.c b/source/blender/blenkernel/intern/anim_path.c
index 57f64d7a0f8..1f8c6df6147 100644
--- a/source/blender/blenkernel/intern/anim_path.c
+++ b/source/blender/blenkernel/intern/anim_path.c
@@ -55,7 +55,7 @@ float BKE_anim_path_get_length(const CurveCache *curve_cache)
 
 void BKE_anim_path_calc_data(Object *ob)
 {
-  if (ob == NULL || ob->type != OB_CURVE) {
+  if (ob == NULL || ob->type != OB_CURVES_LEGACY) {
     return;
   }
   if (ob->runtime.curve_cache == NULL) {
@@ -222,7 +222,7 @@ bool BKE_where_on_path(const Object *ob,
                        float *r_radius,
                        float *r_weight)
 {
-  if (ob == NULL || ob->type != OB_CURVE) {
+  if (ob == NULL || ob->type != OB_CURVES_LEGACY) {
     return false;
   }
   Curve *cu = ob->data;
diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c
index 099588a0e14..361ab176abd 100644
--- a/source/blender/blenkernel/intern/armature_update.c
+++ b/source/blender/blenkernel/intern/armature_update.c
@@ -70,7 +70,7 @@ static void splineik_init_tree_from_pchan(Scene *UNUSED(scene),
       ik_data = con->data;
 
       /* Target can only be a curve. */
-      if ((ik_data->tar == NULL) || (ik_data->tar->type != OB_CURVE)) {
+      if ((ik_data->tar == NULL) || (ik_data->tar->type != OB_CURVES_LEGACY)) {
         continue;
       }
       /* Skip if disabled. */
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 69002a71f1d..47669387fd1 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -1493,7 +1493,7 @@ static void followpath_get_tarmat(struct Depsgraph *UNUSED(depsgraph),
 {
   bFollowPathConstraint *data = con->data;
 
-  if (VALID_CONS_TARGET(ct) && (ct->tar->type == OB_CURVE)) {
+  if (VALID_CONS_TARGET(ct) && (ct->tar->type == OB_CURVES_LEGACY)) {
     Curve *cu = ct->tar->data;
     float vec[4], dir[3], radius;
     float curvetime;
@@ -2479,7 +2479,7 @@ static void pycon_get_tarmat(struct Depsgraph *UNUSED(depsgraph),
 #endif
 
   if (VALID_CONS_TARGET(ct)) {
-    if (ct->tar->type == OB_CURVE && ct->tar->runtime.curve_cache == NULL) {
+    if (ct->tar->type == OB_CURVES_LEGACY && ct->tar->runtime.curve_cache == NULL) {
       unit_m4(ct->matrix);
       return;
     }
@@ -3867,7 +3867,7 @@ static void clampto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar
   bConstraintTarget *ct = targets->first;
 
   /* only evaluate if there is a target and it is a curve */
-  if (VALID_CONS_TARGET(ct) && (ct->tar->type == OB_CURVE)) {
+  if (VALID_CONS_TARGET(ct) && (ct->tar->type == OB_CURVES_LEGACY)) {
     float obmat[4][4], ownLoc[3];
     float curveMin[3], curveMax[3];
     float targetMatrix[4][4];
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index 7fcbbfd316f..28bcd961e26 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -1148,7 +1148,7 @@ enum eContextObjectMode CTX_data_mode_enum_ex(const Object *obedit,
     switch (obedit->type) {
       case OB_MESH:
         return CTX_MODE_EDIT_MESH;
-      case OB_CURVE:
+      case OB_CURVES_LEGACY:
         return CTX_MODE_EDIT_CURVE;
       case OB_SURF:
         return CTX_MODE_EDIT_SURFACE;
diff --git a/source/blender/blenkernel/intern/curve.cc b/source/blender/blenkernel/intern/curve.cc
index c6c0111780e..b0f58dd4ec9 100644
--- a/source/blender/blenkernel/intern/curve.cc
+++ b/source/blender/blenkernel/intern/curve.cc
@@ -293,14 +293,14 @@ static void curve_blend_read_expand(BlendExpander *expander, ID *id)
   BLO_expand(expander, cu->textoncurve);
 }
 
-IDTypeInfo IDType_ID_CU = {
-    /* id_code */ ID_CU,
-    /* id_filter */ FILTER_ID_CU,
-    /* main_listbase_index */ INDEX_ID_CU,
+IDTypeInfo IDType_ID_CU_LEGACY = {
+    /* id_code */ ID_CU_LEGACY,
+    /* id_filter */ FILTER_ID_CU_LEGACY,
+    /* main_listbase_index */ INDEX_ID_CU_LEGACY,
     /* struct_size */ sizeof(Curve),
     /* name */ "Curve",
     /* name_plural */ "curves",
-    /* translation_context */ BLT_I18NCONTEXT_ID_CURVE,
+    /* translation_context */ BLT_I18NCONTEXT_ID_CURVE_LEGACY,
     /* flags */ IDTYPE_FLAGS_APPEND_IS_REUSABLE,
     /* asset_type_info */ nullptr,
 
@@ -406,7 +406,7 @@ Curve *BKE_curve_add(Main *bmain, const char *name, int type)
   Curve *cu;
 
   /* We cannot use #BKE_id_new here as we need some custom initialization code. */
-  cu = (Curve *)BKE_libblock_alloc(bmain, ID_CU, name, 0);
+  cu = (Curve *)BKE_libblock_alloc(bmain, ID_CU_LEGACY, name, 0);
 
   BKE_curve_init(cu, type);
 
@@ -440,7 +440,7 @@ short BKE_curve_type_get(const Curve *cu)
   }
 
   if (!cu->type) {
-    type = OB_CURVE;
+    type = OB_CURVES_LEGACY;
 
     LISTBASE_FOREACH (Nurb *, nu, &cu->nurb) {
       if (nu->pntsv > 1) {
@@ -473,7 +473,7 @@ void BKE_curve_type_test(Object *ob)
 {
   ob->type = BKE_curve_type_get((Curve *)ob->data);
 
-  if (ob->type == OB_CURVE) {
+  if (ob->type == OB_CURVES_LEGACY) {
     Curve *cu = (Curve *)ob->data;
     if (CU_IS_2D(cu)) {
       BKE_curve_dimension_update(cu);
diff --git a/source/blender/blenkernel/intern/curve_bevel.c b/source/blender/blenkernel/intern/curve_bevel.c
index ffef22fb498..6f32f0f5e6f 100644
--- a/source/blender/blenkernel/intern/curve_bevel.c
+++ b/source/blender/blenkernel/intern/curve_bevel.c
@@ -228,7 +228,7 @@ static void curve_bevel_make_from_object(const Curve *cu, ListBase *disp)
   if (cu->bevobj == NULL) {
     return;
   }
-  if (cu->bevobj->type != OB_CURVE) {
+  if (cu->bevobj->type != OB_CURVES_LEGACY) {
     return;
   }
 
diff --git a/source/blender/blenkernel/intern/curve_convert.c b/source/blender/blenkernel/intern/curve_convert.c
index 285e6978522..129e930a21e 100644
--- a/source/blender/blenkernel/intern/curve_convert.c
+++ b/source/blender/blenkernel/intern/curve_convert.c
@@ -27,7 +27,7 @@ static Curve *curve_from_font_object(Object *object, Depsgraph *depsgraph)
   Object *evaluated_object = DEG_get_evaluated_object(depsgraph, object);
   BKE_vfont_to_curve_nubase(evaluated_object, FO_EDIT, &new_curve->nurb);
 
-  new_curve->type = OB_CURVE;
+  new_curve->type = OB_CURVES_LEGACY;
 
   new_curve->flag &= ~CU_3D;
   BKE_curve_dimension_update(new_curve);
@@ -55,7 +55,7 @@ static Curve *curve_from_curve_object(Object *object, Depsgraph *depsgraph, bool
 
 Curve *BKE_curve_new_from_object(Object *object, Depsgraph *depsgraph, bool apply_modifiers)
 {
-  if (!ELEM(object->type, OB_FONT, OB_CURVE)) {
+  if (!ELEM(object->type, OB_FONT, OB_CURVES_LEGACY)) {
     return NULL;
   }
 
diff --git a/source/blender/blenkernel/intern/curve_deform.c b/source/blender/blenkernel/intern/curve_deform.c
index f76e4202994..fb082fccc0b 100644
--- a/source/blender/blenkernel/intern/curve_deform.c
+++ b/source/blender/blenkernel/intern/curve_deform.c
@@ -211,7 +211,7 @@ static void curve_deform_coords_impl(const Object *ob_curve,
   bool use_dverts = false;
   int cd_dvert_offset;
 
-  if (ob_curve->type != OB_CURVE) {
+  if (ob_curve->type != OB_CURVES_LEGACY) {
     return;
   }
 
@@ -404,7 +404,7 @@ void BKE_curve_deform_co(const Object *ob_curve,
   CurveDeform cd;
   float quat[4];
 
-  if (ob_curve->type != OB_CURVE) {
+  if (ob_curve->type != OB_CURVES_LEGACY) {
     unit_m3(r_mat);
     return;
   }
diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc
index 793af80ec74..5c761e94bb9 100644
--- a/source/blender/blenkernel/intern/displist.cc
+++ b/source/blender/blenkernel/intern/displist.cc
@@ -590,7 +590,7 @@ static float displist_calc_taper(Depsgraph *depsgraph,
                                  Object *taperobj,
                                  float fac)
 {
-  if (taperobj == nullptr || taperobj->type != OB_CURVE) {
+  if (taperobj == nullptr || taperobj->type != OB_CURVES_LEGACY) {
     return 1.0;
   }
 
@@ -1263,7 +1263,7 @@ static GeometrySet evaluate_curve_type_object(Depsgraph *depsgraph,
                                               const bool for_render,
                                               ListBase *r_dispbase)
 {
-  BLI_assert(ELEM(ob->type, OB_CURVE, OB_FONT));
+  BLI_assert(ELEM(ob->type, OB_CURVES_LEGACY, OB_FONT));
   const Curve *cu = (const Curve *)ob->data;
 
   ListBase *deformed_nurbs = &ob->runtime.curve_cache->deformed_nurbs;
@@ -1473,7 +1473,7 @@ void BKE_displist_make_curveTypes(Depsgraph *depsgraph,
                                   Object *ob,
                                   const bool for_render)
 {
-  BLI_assert(ELEM(ob->type, OB_SURF, OB_CURVE, OB_FONT));
+  BLI_assert(ELEM(ob->type, OB_SURF, OB_CURVES_LEGACY, OB_FONT));
   Curve &cow_curve = *(Curve *)ob->data;
 
   BKE_object_free_derived_caches(ob);
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index 2f760597e1a..f2915a97746 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -143,7 +143,7 @@ static void precalculate_effector(struct Depsgraph *depsgraph, EffectorCache *ef
     BLI_rng_srandom(eff->pd->rng, eff->pd->seed + cfra);
   }
 
-  if (eff->pd->forcefield == PFIELD_GUIDE && eff->ob->type == OB_CURVE) {
+  if (eff->pd->forcefield == PFIELD_GUIDE && eff->ob->type == OB_CURVES_LEGACY) {
     Curve *cu = eff->ob->data;
     if (cu->flag & CU_PATH) {
       if (eff->ob->runtime.curve_cache == NULL ||
@@ -161,7 +161,7 @@ static void precalculate_effector(struct Depsgraph *depsgraph, EffectorCache *ef
   }
   else if (eff->pd->shape == PFIELD_SHAPE_SURFACE) {
     eff->surmd = (SurfaceModifierData *)BKE_modifiers_findby_type(eff->ob, eModifierType_Surface);
-    if (eff->ob->type == OB_CURVE) {
+    if (eff->ob->type == OB_CURVES_LEGACY) {
       eff->flag |= PE_USE_NORMAL_DATA;
     }
   }
diff --git a/source/blender/blenkernel/intern/geometry_component_curve.cc b/source/blender/blenkernel/intern/geometry_component_curve.cc
index 5921f853389..fff77dbd367 100644
--- a/source/blender/blenkernel/intern/geometry_component_curve.cc
+++ b/source/blender/blenkernel/intern/geometry_component_curve.cc
@@ -128,7 +128,7 @@ const Curve *CurveComponent::get_curve_for_render() const
     return curve_for_render_;
   }
 
-  curve_for_render_ = (Curve *)BKE_id_new_nomain(ID_CU, nullptr);
+  curve_for_render_ = (Curve *)BKE_id_new_nomain(ID_CU_LEGACY, nullptr);
   curve_for_render_->curve_eval = curve_;
 
   return curve_for_render_;
diff --git a/source/blender/blenkernel/intern/geometry_set.cc b/source/blender/blenkernel/intern/geometry_set.cc
index 9c7cfa04e0b..13441b4914a 100644
--- a/source/blender/blenkernel/intern/geometry_set.cc
+++ b/source/blender/blenkernel/intern/geometry_set.cc
@@ -632,7 +632,7 @@ bool BKE_object_has_geometry_set_instances(const Object *ob)
         is_instance = ob->type != OB_VOLUME;
         break;
       case GEO_COMPONENT_TYPE_CURVE:
-        is_instance = !ELEM(ob->type, OB_CURVE, OB_FONT);
+        is_instance = !ELEM(ob->type, OB_CURVES_LEGACY, OB_FONT);
         break;
     }
     if (is_instance) {
diff --git a/source/blender/blenkernel/intern/idtype.c b/source/blender/blenkernel/intern/idtype.c
index 2551bb12511..5b9dfa55c45 100644
--- a/source/blender/blenkernel/intern/idtype.c
+++ b/source/blender/blenkernel/intern/idtype.c
@@ -59,7 +59,7 @@ static void id_type_init(void)
   INIT_TYPE(ID_LI);
   INIT_TYPE(ID_OB);
   INIT_TYPE(ID_ME);
-  INIT_TYPE(ID_CU);
+  INIT_TYPE(ID_CU_LEGACY);
   INIT_TYPE(ID_MB);
   INIT_TYPE(ID_MA);
   INIT_TYPE(ID_TE);
@@ -215,7 +215,7 @@ uint64_t BKE_idtype_idcode_to_idfilter(const short idcode)
     CASE_IDFILTER(BR);
     CASE_IDFILTER(CA);
     CASE_IDFILTER(CF);
-    CASE_IDFILTER(CU);
+    CASE_IDFILTER(CU_LEGACY);
     CASE_IDFILTER(GD);
     CASE_IDFILTER(GR);
     CASE_IDFILTER(CV);
@@ -264,7 +264,7 @@ short BKE_idtype_idcode_from_idfilter(const uint64_t idfilter)
     CASE_IDFILTER(BR);
     CASE_IDFILTER(CA);
     CASE_IDFILTER(CF);
-    CASE_IDFILTER(CU);
+    CASE_IDFILTER(CU_LEGACY);
     CASE_IDFILTER(GD);
     CASE_IDFILTER(GR);
     CASE_IDFILTER(CV);
@@ -312,7 +312,7 @@ int BKE_idtype_idcode_to_index(const short idcode)
     CASE_IDINDEX(BR);
     CASE_IDINDEX(CA);
     CASE_IDINDEX(CF);
-    CASE_IDINDEX(CU);
+    CASE_IDINDEX(CU_LEGACY);
     CASE_IDINDEX(GD);
     CASE_IDINDEX(GR);
     CASE_IDINDEX(CV);
@@ -371,7 +371,7 @@ short BKE_idtype_idcode_from_index(const int index)
     CASE_IDCODE(BR);
     CASE_IDCODE(CA);
     CASE_IDCODE(CF);
-    CASE_IDCODE(CU);
+    CASE_IDCODE(CU_LEGACY);
     CASE_IDCODE(GD);
     CASE_IDCODE(GR);
     CASE_IDCODE(CV);
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index e5c1cf96f8c..abd6505456e 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -1090,7 +1090,7 @@ static char *get_rna_access(ID *id,
       propname = particle_adrcodes_to_paths(adrcode, &dummy_index);
       break;
 
-    case ID_CU: /* curve */
+    case ID_CU_LEGACY: /* curve */
       /* this used to be a 'dummy' curve which got evaluated on the fly...
        * now we've got real var for this!
        */
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index b28d9db92cf..e28094c0abc 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -281,7 +281,7 @@ Key *BKE_key_add(Main *bmain, ID *id) /* common function */
       key->elemsize = sizeof(float[KEYELEM_FLOAT_LEN_COORD]);
 
       break;
-    case ID_CU:
+    case ID_CU_LEGACY:
       el = key->elemstr;
 
       el[0] = KEYELEM_ELEM_SIZE_CURVE;
@@ -659,7 +659,7 @@ static bool key_pointer_size(const Key *key, const int mode, int *poinsize, int
       *ofs = sizeof(float[KEYELEM_FLOAT_LEN_COORD]);
       *poinsize = *ofs;
       break;
-    case ID_CU:
+    case ID_CU_LEGACY:
       if (mode == KEY_MODE_BPOINT) {
         *ofs = sizeof(float[KEYELEM_FLOAT_LEN_BPOINT]);
         *step = KEYELEM_ELEM_LEN_BPOINT;
@@ -1524,7 +1524,7 @@ float *BKE_key_evaluate_object_ex(Object *ob, int *r_totelem, float *arr, size_t
     tot = lt->pntsu * lt->pntsv * lt->pntsw;
     size = tot * sizeof(float[KEYELEM_FLOAT_LEN_COORD]);
   }
-  else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
+  else if (ELEM(ob->type, OB_CURVES_LEGACY, OB_SURF)) {
     Curve *cu = ob->data;
 
     tot = BKE_keyblock_curve_element_count(&cu->nurb);
@@ -1570,7 +1570,7 @@ float *BKE_key_evaluate_object_ex(Object *ob, int *r_totelem, float *arr, size_t
         MEM_freeN(weights);
       }
     }
-    else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
+    else if (ELEM(ob->type, OB_CURVES_LEGACY, OB_SURF)) {
       cp_cu_key(ob->data, key, actkb, kb, 0, tot, out, tot);
     }
   }
@@ -1582,7 +1582,7 @@ float *BKE_key_evaluate_object_ex(Object *ob, int *r_totelem, float *arr, size_t
     else if (ob->type == OB_LATTICE) {
       do_latt_key(ob, key, out, tot);
     }
-    else if (ob->type == OB_CURVE) {
+    else if (ob->type == OB_CURVES_LEGACY) {
       do_curve_key(ob, key, out, tot);
     }
     else if (ob->type == OB_SURF) {
@@ -1714,7 +1714,7 @@ bool BKE_key_idtype_support(const short id_type)
 {
   switch (id_type) {
     case ID_ME:
-    case ID_CU:
+    case ID_CU_LEGACY:
     case ID_LT:
       return true;
     default:
@@ -1729,7 +1729,7 @@ Key **BKE_key_from_id_p(ID *id)
       Mesh *me = (Mesh *)id;
       return &me->key;
     }
-    case ID_CU: {
+    case ID_CU_LEGACY: {
       Curve *cu = (Curve *)id;
       if (cu->vfont == NULL) {
         return &cu->key;
@@ -2269,7 +2269,7 @@ void BKE_keyblock_update_from_vertcos(Object *ob, KeyBlock *kb, const float (*ve
     Lattice *lt = ob->data;
     BLI_assert((lt->pntsu * lt->pntsv * lt->pntsw) == kb->totelem);
   }
-  else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
+  else if (ELEM(ob->type, OB_CURVES_LEGACY, OB_SURF)) {
     Curve *cu = ob->data;
     BLI_assert(BKE_keyblock_curve_element_count(&cu->nurb) == kb->totelem);
   }
@@ -2293,7 +2293,7 @@ void BKE_keyblock_update_from_vertcos(Object *ob, KeyBlock *kb, const float (*ve
       copy_v3_v3(fp, *co);
     }
   }
-  else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
+  else if (ELEM(ob->type, OB_CURVES_LEGACY, OB_SURF)) {
     Curve *cu = (Curve *)ob->data;
     Nurb *nu;
     BezTriple *bezt;
@@ -2335,7 +2335,7 @@ void BKE_keyblock_convert_from_vertcos(Object *ob, KeyBlock *kb, const float (*v
     tot = lt->pntsu * lt->pntsv * lt->pntsw;
     elemsize = lt->key->elemsize;
   }
-  else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
+  else if (ELEM(ob->type, OB_CURVES_LEGACY, OB_SURF)) {
     Curve *cu = (Curve *)ob->data;
     elemsize = cu->key->elemsize;
     tot = BKE_keyblock_curve_element_count(&cu->nurb);
@@ -2366,7 +2366,7 @@ float (*BKE_keyblock_convert_to_vertcos(Object *ob, KeyBlock *kb))[3]
     Lattice *lt = (Lattice *)ob->data;
     tot = lt->pntsu * lt->pntsv * lt->pntsw;
   }
-  else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
+  else if (ELEM(ob->type, OB_CURVES_LEGACY, OB_SURF)) {
     Curve *cu = (Curve *)ob->data;
     tot = BKE_nurbList_verts_count(&cu->nurb);
   }
@@ -2383,7 +2383,7 @@ float (*BKE_keyblock_convert_to_vertcos(Object *ob, KeyBlock *kb))[3]
       copy_v3_v3(*co, fp);
     }
   }
-  else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
+  else if (ELEM(ob->type, OB_CURVES_LEGACY, OB_SURF)) {
     Curve *cu = (Curve *)ob->data;
     Nurb *nu;
     BezTriple *bezt;
@@ -2422,7 +2422,7 @@ void BKE_keyblock_update_from_offset(Object *ob, KeyBlock *kb, const float (*ofs
       add_v3_v3(fp, *ofs);
     }
   }
-  else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
+  else if (ELEM(ob->type, OB_CURVES_LEGACY, OB_SURF)) {
     Curve *cu = (Curve *)ob->data;
     Nurb *nu;
     BezTriple *bezt;
diff --git a/source/blender/blenkernel/intern/lib_query.c b/source/blender/blenkernel/intern/lib_query.c
index ba009072db8..0103e40e90d 100644
--- a/source/blender/blenkernel/intern/lib_query.c
+++ b/source/blender/blenkernel/intern/lib_query.c
@@ -402,7 +402,7 @@ uint64_t BKE_library_id_can_use_filter_id(const ID *id_owner)
       return FILTER_ID_ALL;
     case ID_ME:
       return FILTER_ID_ME | FILTER_ID_MA | FILTER_ID_IM;
-    case ID_CU:
+    case ID_CU_LEGACY:
       return FILTER_ID_OB | FILTER_ID_MA | FILTER_ID_VF;
     case ID_MB:
       return FILTER_ID_MA;
@@ -418,7 +418,7 @@ uint64_t BKE_library_id_can_use_filter_id(const ID *id_owner)
       return FILTER_ID_OB | FILTER_ID_IM;
     case ID_KE:
       /* Warning! key->from, could be more types in future? */
-      return FILTER_ID_ME | FILTER_ID_CU | FILTER_ID_LT;
+      return FILTER_ID_ME | FILTER_ID_CU_LEGACY | FILTER_ID_LT;
     case ID_SCR:
       return FILTER_ID_SCE;
     case ID_WO:
@@ -490,7 +490,7 @@ bool BKE_library_id_can_use_idtype(ID *id_owner, const short id_type_used)
 
   /* Exception: ID_KE aren't available as filter_id. */
   if (id_type_used == ID_KE) {
-    return ELEM(id_type_owner, ID_ME, ID_CU, ID_LT);
+    return ELEM(id_type_owner, ID_ME, ID_CU_LEGACY, ID_LT);
   }
 
   /* Exception: ID_SCR aren't available as filter_id. */
diff --git a/source/blender/blenkernel/intern/lib_remap.c b/source/blender/blenkernel/intern/lib_remap.c
index 9329a09f1b6..24e7178dd63 100644
--- a/source/blender/blenkernel/intern/lib_remap.c
+++ b/source/blender/blenkernel/intern/lib_remap.c
@@ -380,7 +380,7 @@ static void libblock_remap_data_postprocess_obdata_relink(Main *bmain, Object *o
       case ID_ME:
         multires_force_sculpt_rebuild(ob);
         break;
-      case ID_CU:
+      case ID_CU_LEGACY:
         BKE_curve_type_test(ob);
         break;
       default:
@@ -573,7 +573,7 @@ static void libblock_remap_foreach_idpair_cb(ID *old_id, ID *new_id, void *user_
           bmain, NULL, (Collection *)old_id, (Collection *)new_id);
       break;
     case ID_ME:
-    case ID_CU:
+    case ID_CU_LEGACY:
     case ID_MB:
     case ID_CV:
     case ID_PT:
diff --git a/source/blender/blenkernel/intern/main.c b/source/blender/blenkernel/intern/main.c
index b25432780ed..03e03dacfbc 100644
--- a/source/blender/blenkernel/intern/main.c
+++ b/source/blender/blenkernel/intern/main.c
@@ -563,7 +563,7 @@ ListBase *which_libbase(Main *bmain, short type)
       return &(bmain->objects);
     case ID_ME:
       return &(bmain->meshes);
-    case ID_CU:
+    case ID_CU_LEGACY:
       return &(bmain->curves);
     case ID_MB:
       return &(bmain->metaballs);
@@ -670,7 +670,7 @@ int set_listbasepointers(Main *bmain, ListBase *lb[/*INDEX_ID_MAX*/])
 
   lb[INDEX_ID_CF] = &(bmain->cachefiles);
   lb[INDEX_ID_ME] = &(bmain->meshes);
-  lb[INDEX_ID_CU] = &(bmain->curves);
+  lb[INDEX_ID_CU_LEGACY] = &(bmain->curves);
   lb[INDEX_ID_MB] = &(bmain->metaballs);
   lb[INDEX_ID_CV] = &(bmain->hair_curves);
   lb[INDEX_ID_PT] = &(bmain->pointclouds);
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index c559c6fe807..7d01a92e829 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -313,7 +313,7 @@ Material ***BKE_object_material_array_p(Object *ob)
     Mesh *me = ob->data;
     return &(me->mat);
   }
-  if (ELEM(ob->type, OB_CURVE, OB_FONT, OB_SURF)) {
+  if (ELEM(ob->type, OB_CURVES_LEGACY, OB_FONT, OB_SURF)) {
     Curve *cu = ob->data;
     return &(cu->mat);
   }
@@ -346,7 +346,7 @@ short *BKE_object_material_len_p(Object *ob)
     Mesh *me = ob->data;
     return &(me->totcol);
   }
-  if (ELEM(ob->type, OB_CURVE, OB_FONT, OB_SURF)) {
+  if (ELEM(ob->type, OB_CURVES_LEGACY, OB_FONT, OB_SURF)) {
     Curve *cu = ob->data;
     return &(cu->totcol);
   }
@@ -381,7 +381,7 @@ Material ***BKE_id_material_array_p(ID *id)
   switch (GS(id->name)) {
     case ID_ME:
       return &(((Mesh *)id)->mat);
-    case ID_CU:
+    case ID_CU_LEGACY:
       return &(((Curve *)id)->mat);
     case ID_MB:
       return &(((MetaBall *)id)->mat);
@@ -407,7 +407,7 @@ short *BKE_id_material_len_p(ID *id)
   switch (GS(id->name)) {
     case ID_ME:
       return &(((Mesh *)id)->totcol);
-    case ID_CU:
+    case ID_CU_LEGACY:
       return &(((Curve *)id)->totcol);
     case ID_MB:
       return &(((MetaBall *)id)->totcol);
@@ -434,7 +434,7 @@ static void material_data_index_remove_id(ID *id, short index)
     case ID_ME:
       BKE_mesh_material_index_remove((Mesh *)id, index);
       break;
-    case ID_CU:
+    case ID_CU_LEGACY:
       BKE_curve_material_index_remove((Curve *)id, index);
       break;
     case ID_MB:
@@ -468,7 +468,7 @@ bool BKE_object_material_slot_used(Object *object, short actcol)
   switch (GS(ob_data->name)) {
     case ID_ME:
       return BKE_mesh_material_index_used((Mesh *)ob_data, actcol - 1);
-    case ID_CU:
+    case ID_CU_LEGACY:
       return BKE_curve_material_index_used((Curve *)ob_data, actcol - 1);
     case ID_MB:
       /* Meta-elements don't support materials at the moment. */
@@ -489,7 +489,7 @@ static void material_data_index_clear_id(ID *id)
     case ID_ME:
       BKE_mesh_material_index_clear((Mesh *)id);
       break;
-    case ID_CU:
+    case ID_CU_LEGACY:
       BKE_curve_material_index_clear((Curve *)id);
       break;
     case ID_MB:
@@ -1062,7 +1062,7 @@ void BKE_object_material_remap(Object *ob, const unsigned int *remap)
   if (ob->type == OB_MESH) {
     BKE_mesh_material_remap(ob->data, remap, ob->totcol);
   }
-  else if (ELEM(ob->type, OB_CURVE, OB_SURF, OB_FONT)) {
+  else if (ELEM(ob->type, OB_CURVES_LEGACY, OB_SURF, OB_FONT)) {
     BKE_curve_material_remap(ob->data, remap, ob->totcol);
   }
   else if (ob->type == OB_GPENCIL) {
@@ -1314,7 +1314,7 @@ bool BKE_object_material_slot_remove(Main *bmain, Object *ob)
   }
 
   /* check indices from mesh */
-  if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT)) {
+  if (ELEM(ob->type, OB_MESH, OB_CURVES_LEGACY, OB_SURF, OB_FONT)) {
     material_data_index_remove_id((ID *)ob->data, actcol - 1);
     if (ob->runtime.curve_cache) {
       BKE_displist_free(&ob->runtime.curve_cache->disp);
diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc
index 121bfbff394..26ef467fae5 100644
--- a/source/blender/blenkernel/intern/mesh_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_convert.cc
@@ -739,14 +739,14 @@ void BKE_mesh_to_curve(Main *bmain, Depsgraph *depsgraph, Scene *UNUSED(scene),
   BKE_mesh_to_curve_nurblist(me_eval, &nurblist, 1);
 
   if (nurblist.first) {
-    Curve *cu = BKE_curve_add(bmain, ob->id.name + 2, OB_CURVE);
+    Curve *cu = BKE_curve_add(bmain, ob->id.name + 2, OB_CURVES_LEGACY);
     cu->flag |= CU_3D;
 
     cu->nurb = nurblist;
 
     id_us_min(&((Mesh *)ob->data)->id);
     ob->data = cu;
-    ob->type = OB_CURVE;
+    ob->type = OB_CURVES_LEGACY;
 
     BKE_object_free_derived_caches(ob);
   }
@@ -886,7 +886,7 @@ static void object_for_curve_to_mesh_free(Object *temp_object)
 {
   /* Clear edit mode pointers that were explicitly copied to the temporary curve. */
   ID *final_object_data = static_cast<ID *>(temp_object->data);
-  if (GS(final_object_data->name) == ID_CU) {
+  if (GS(final_object_data->name) == ID_CU_LEGACY) {
     Curve &curve = *reinterpret_cast<Curve *>(final_object_data);
     curve.editfont = nullptr;
     curve.editnurb = nullptr;
@@ -901,7 +901,7 @@ static void object_for_curve_to_mesh_free(Object *temp_object)
  */
 static void curve_to_mesh_eval_ensure(Object &object)
 {
-  BLI_assert(GS(static_cast<ID *>(object.data)->name) == ID_CU);
+  BLI_assert(GS(static_cast<ID *>(object.data)->name) == ID_CU_LEGACY);
   Curve &curve = *static_cast<Curve *>(object.data);
   /* Clear all modifiers for the bevel object.
    *
@@ -1110,7 +1110,7 @@ Mesh *BKE_mesh_new_from_object(Depsgraph *depsgraph,
   Mesh *new_mesh = nullptr;
   switch (object->type) {
     case OB_FONT:
-    case OB_CURVE:
+    case OB_CURVES_LEGACY:
     case OB_SURF:
       new_mesh = mesh_new_from_curve_type_object(object);
       break;
@@ -1182,7 +1182,7 @@ Mesh *BKE_mesh_new_from_object_to_bmain(Main *bmain,
                                         Object *object,
                                         bool preserve_all_data_layers)
 {
-  BLI_assert(ELEM(object->type, OB_FONT, OB_CURVE, OB_SURF, OB_MBALL, OB_MESH));
+  BLI_assert(ELEM(object->type, OB_FONT, OB_CURVES_LEGACY, OB_SURF, OB_MBALL, OB_MESH));
 
   Mesh *mesh = BKE_mesh_new_from_object(depsgraph, object, preserve_all_data_layers, false);
   if (mesh == nullptr) {
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 837c1fe179f..5af8dfc2b72 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -668,7 +668,7 @@ ModifierData *BKE_modifiers_get_virtual_modifierlist(const Object *ob,
       virtualModifierData->amd.deformflag = ((bArmature *)(ob->parent->data))->deformflag;
       md = &virtualModifierData->amd.modifier;
     }
-    else if (ob->parent->type == OB_CURVE && ob->partype == PARSKEL) {
+    else if (ob->parent->type == OB_CURVES_LEGACY && ob->partype == PARSKEL) {
       virtualModifierData->cmd.object = ob->parent;
       virtualModifierData->cmd.defaxis = ob->trackflag + 1;
       virtualModifierData->cmd.modifier.next = md;
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc
index c5d1853ba6c..985c9edac1a 100644
--- a/source/blender/blenkernel/intern/object.cc
+++ b/source/blender/blenkernel/intern/object.cc
@@ -1385,8 +1385,14 @@ ModifierData *BKE_object_active_modifier(const Object *ob)
 
 bool BKE_object_supports_modifiers(const Object *ob)
 {
-  return (
-      ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_LATTICE, OB_POINTCLOUD, OB_VOLUME));
+  return (ELEM(ob->type,
+               OB_MESH,
+               OB_CURVES_LEGACY,
+               OB_SURF,
+               OB_FONT,
+               OB_LATTICE,
+               OB_POINTCLOUD,
+               OB_VOLUME));
 }
 
 bool BKE_object_support_modifier_type_check(const Object *ob, int modifier_type)
@@ -1402,7 +1408,7 @@ bool BKE_object_support_modifier_type_check(const Object *ob, int modifier_type)
   if (ELEM(ob->type, OB_POINTCLOUD, OB_VOLUME, OB_CURVES)) {
     return (mti->modifyGeometrySet != nullptr);
   }
-  if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_LATTICE)) {
+  if (ELEM(ob->type, OB_MESH, OB_CURVES_LEGACY, OB_SURF, OB_FONT, OB_LATTICE)) {
     if (ob->type == OB_LATTICE && (mti->flags & eModifierTypeFlag_AcceptsVertexCosOnly) == 0) {
       return false;
     }
@@ -1871,7 +1877,7 @@ bool BKE_object_is_in_editmode(const Object *ob)
     case OB_LATTICE:
       return ((Lattice *)ob->data)->editlatt != nullptr;
     case OB_SURF:
-    case OB_CURVE:
+    case OB_CURVES_LEGACY:
       return ((Curve *)ob->data)->editnurb != nullptr;
     case OB_GPENCIL:
       /* Grease Pencil object has no edit mode data. */
@@ -1893,7 +1899,7 @@ bool BKE_object_data_is_in_editmode(const ID *id)
   switch (type) {
     case ID_ME:
       return ((const Mesh *)id)->edit_mesh != nullptr;
-    case ID_CU:
+    case ID_CU_LEGACY:
       return ((((const Curve *)id)->editnurb != nullptr) ||
               (((const Curve *)id)->editfont != nullptr));
     case ID_MB:
@@ -1919,7 +1925,7 @@ char *BKE_object_data_editmode_flush_ptr_get(struct ID *id)
       }
       break;
     }
-    case ID_CU: {
+    case ID_CU_LEGACY: {
       if (((Curve *)id)->vfont != nullptr) {
         EditFont *ef = ((Curve *)id)->editfont;
         if (ef != nullptr) {
@@ -2062,7 +2068,7 @@ static const char *get_obdata_defname(int type)
   switch (type) {
     case OB_MESH:
       return DATA_("Mesh");
-    case OB_CURVE:
+    case OB_CURVES_LEGACY:
       return DATA_("Curve");
     case OB_SURF:
       return DATA_("Surf");
@@ -2133,8 +2139,8 @@ void *BKE_object_obdata_add_from_type(Main *bmain, int type, const char *name)
   switch (type) {
     case OB_MESH:
       return BKE_mesh_add(bmain, name);
-    case OB_CURVE:
-      return BKE_curve_add(bmain, name, OB_CURVE);
+    case OB_CURVES_LEGACY:
+      return BKE_curve_add(bmain, name, OB_CURVES_LEGACY);
     case OB_SURF:
       return BKE_curve_add(bmain, name, OB_SURF);
     case OB_FONT:
@@ -2175,7 +2181,7 @@ int BKE_object_obdata_to_type(const ID *id)
   switch (GS(id->name)) {
     case ID_ME:
       return OB_MESH;
-    case ID_CU:
+    case ID_CU_LEGACY:
       return BKE_curve_type_get((const Curve *)id);
     case ID_MB:
       return OB_MBALL;
@@ -2656,7 +2662,7 @@ Object *BKE_object_duplicate(Main *bmain, Object *ob, uint dupflag, uint duplica
         id_new = BKE_id_copy_for_duplicate(bmain, id_old, dupflag, copy_flags);
       }
       break;
-    case OB_CURVE:
+    case OB_CURVES_LEGACY:
       if (dupflag & USER_DUP_CURVE) {
         id_new = BKE_id_copy_for_duplicate(bmain, id_old, dupflag, copy_flags);
       }
@@ -3220,7 +3226,7 @@ static void give_parvert(Object *par, int nr, float vec[3])
                  "object position can be wrong now");
     }
   }
-  else if (ELEM(par->type, OB_CURVE, OB_SURF)) {
+  else if (ELEM(par->type, OB_CURVES_LEGACY, OB_SURF)) {
     ListBase *nurb;
 
     /* Unless there's some weird depsgraph failure the cache should exist. */
@@ -3293,7 +3299,7 @@ void BKE_object_get_parent_matrix(Object *ob, Object *par, float r_parentmat[4][
   switch (ob->partype & PARTYPE) {
     case PAROBJECT: {
       bool ok = false;
-      if (par->type == OB_CURVE) {
+      if (par->type == OB_CURVES_LEGACY) {
         if ((((Curve *)par->data)->flag & CU_PATH) && (ob_parcurve(ob, par, tmat))) {
           ok = true;
         }
@@ -3589,7 +3595,7 @@ BoundBox *BKE_object_boundbox_get(Object *ob)
     case OB_MESH:
       bb = BKE_mesh_boundbox_get(ob);
       break;
-    case OB_CURVE:
+    case OB_CURVES_LEGACY:
     case OB_SURF:
     case OB_FONT:
       bb = BKE_curve_boundbox_get(ob);
@@ -3758,7 +3764,7 @@ void BKE_object_minmax(Object *ob, float r_min[3], float r_max[3], const bool us
   bool changed = false;
 
   switch (ob->type) {
-    case OB_CURVE:
+    case OB_CURVES_LEGACY:
     case OB_FONT:
     case OB_SURF: {
       BoundBox bb = *BKE_curve_boundbox_get(ob);
@@ -4187,7 +4193,7 @@ bool BKE_object_obdata_texspace_get(Object *ob, char **r_texflag, float **r_loc,
       BKE_mesh_texspace_get_reference((Mesh *)ob->data, r_texflag, r_loc, r_size);
       break;
     }
-    case ID_CU: {
+    case ID_CU_LEGACY: {
       Curve *cu = (Curve *)ob->data;
       BKE_curve_texspace_ensure(cu);
       if (r_texflag) {
@@ -4555,7 +4561,7 @@ KeyBlock *BKE_object_shapekey_insert(Main *bmain,
     case OB_MESH:
       key = insert_meshkey(bmain, ob, name, from_mix);
       break;
-    case OB_CURVE:
+    case OB_CURVES_LEGACY:
     case OB_SURF:
       key = insert_curvekey(bmain, ob, name, from_mix);
       break;
@@ -4627,7 +4633,7 @@ bool BKE_object_shapekey_remove(Main *bmain, Object *ob, KeyBlock *kb)
         case OB_MESH:
           BKE_keyblock_convert_to_mesh(key->refkey, (Mesh *)ob->data);
           break;
-        case OB_CURVE:
+        case OB_CURVES_LEGACY:
         case OB_SURF:
           BKE_keyblock_convert_to_curve(
               key->refkey, (Curve *)ob->data, BKE_curve_nurbs_get((Curve *)ob->data));
@@ -4842,7 +4848,7 @@ int BKE_object_is_deform_modified(Scene *scene, Object *ob)
     flag |= eModifierMode_Realtime | eModifierMode_Render;
   }
 
-  if (ob->type == OB_CURVE) {
+  if (ob->type == OB_CURVES_LEGACY) {
     Curve *cu = (Curve *)ob->data;
     if (cu->taperobj != nullptr && object_deforms_in_time(cu->taperobj)) {
       flag |= eModifierMode_Realtime | eModifierMode_Render;
@@ -4919,7 +4925,7 @@ bool BKE_object_supports_material_slots(struct Object *ob)
 {
   return ELEM(ob->type,
               OB_MESH,
-              OB_CURVE,
+              OB_CURVES_LEGACY,
               OB_SURF,
               OB_FONT,
               OB_MBALL,
@@ -5153,7 +5159,7 @@ KDTree_3d *BKE_object_as_kdtree(Object *ob, int *r_tot)
       BLI_kdtree_3d_balance(tree);
       break;
     }
-    case OB_CURVE:
+    case OB_CURVES_LEGACY:
     case OB_SURF: {
       /* TODO: take deformation into account */
       Curve *cu = (Curve *)ob->data;
@@ -5460,7 +5466,7 @@ bool BKE_object_modifier_update_subframe(Depsgraph *depsgraph,
   }
 
   /* for curve following objects, parented curve has to be updated too */
-  if (ob->type == OB_CURVE) {
+  if (ob->type == OB_CURVES_LEGACY) {
     Curve *cu = (Curve *)ob->data;
     BKE_animsys_evaluate_animdata(
         &cu->id, cu->adt, &anim_eval_context, ADT_RECALC_ANIM, flush_to_original);
diff --git a/source/blender/blenkernel/intern/object_dupli.cc b/source/blender/blenkernel/intern/object_dupli.cc
index 18dd61004f5..009a7bd70be 100644
--- a/source/blender/blenkernel/intern/object_dupli.cc
+++ b/source/blender/blenkernel/intern/object_dupli.cc
@@ -851,7 +851,7 @@ static void make_duplis_geometry_set_impl(const DupliContext *ctx,
       dupli->ob_data = (ID *)volume;
     }
   }
-  if (!ELEM(ctx->object->type, OB_CURVE, OB_FONT) || geometry_set_is_instance) {
+  if (!ELEM(ctx->object->type, OB_CURVES_LEGACY, OB_FONT) || geometry_set_is_instance) {
     const CurveComponent *curve_component = geometry_set.get_component_for_read<CurveComponent>();
     if (curve_component != nullptr) {
       const Curve *curve = curve_component->get_curve_for_render();
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 2b0e04d0bd0..3bc2139ca0c 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -181,7 +181,7 @@ void BKE_object_handle_data_update(Depsgraph *depsgraph, Scene *scene, Object *o
       BKE_displist_make_mball(depsgraph, scene, ob);
       break;
 
-    case OB_CURVE:
+    case OB_CURVES_LEGACY:
     case OB_SURF:
     case OB_FONT: {
       bool for_render = (DEG_get_mode(depsgraph) == DAG_EVAL_RENDER);
@@ -300,7 +300,7 @@ void BKE_object_data_batch_cache_dirty_tag(ID *object_data)
       BKE_lattice_batch_cache_dirty_tag((struct Lattice *)object_data,
                                         BKE_LATTICE_BATCH_DIRTY_ALL);
       break;
-    case ID_CU:
+    case ID_CU_LEGACY:
       BKE_curve_batch_cache_dirty_tag((struct Curve *)object_data, BKE_CURVE_BATCH_DIRTY_ALL);
       break;
     case ID_MB:
@@ -364,7 +364,7 @@ void BKE_object_data_select_update(Depsgraph *depsgraph, ID *object_data)
     case ID_ME:
       BKE_mesh_batch_cache_dirty_tag((Mesh *)object_data, BKE_MESH_BATCH_DIRTY_SELECT);
       break;
-    case ID_CU:
+    case ID_CU_LEGACY:
       BKE_curve_batch_cache_dirty_tag((Curve *)object_data, BKE_CURVE_BATCH_DIRTY_SELECT);
       break;
     case ID_LT:
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 7b8e5a1409a..38066f95084 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -2967,7 +2967,7 @@ static void curve_surf_to_softbody(Object *ob)
   totvert = BKE_nurbList_verts_count(&cu->nurb);
 
   if (ob->softflag & OB_SB_EDGES) {
-    if (ob->type == OB_CURVE) {
+    if (ob->type == OB_CURVES_LEGACY) {
       totspring = totvert - BLI_listbase_count(&cu->nurb);
     }
   }
@@ -3320,7 +3320,7 @@ static void softbody_reset(Object *ob, SoftBody *sb, float (*vertexCos)[3], int
       break;
     case OB_LATTICE:
       break;
-    case OB_CURVE:
+    case OB_CURVES_LEGACY:
     case OB_SURF:
       break;
     default:
@@ -3537,7 +3537,7 @@ void sbObjectStep(struct Depsgraph *depsgraph,
       case OB_LATTICE:
         lattice_to_softbody(ob);
         break;
-      case OB_CURVE:
+      case OB_CURVES_LEGACY:
       case OB_SURF:
         curve_surf_to_softbody(ob);
         break;
diff --git a/source/blender/blenkernel/intern/vfont.c b/source/blender/blenkernel/intern/vfont.c
index cb5e351e78a..5f1bb7db231 100644
--- a/source/blender/blenkernel/intern/vfont.c
+++ b/source/blender/blenkernel/intern/vfont.c
@@ -1302,8 +1302,8 @@ static bool vfont_to_curve(Object *ob,
   MEM_freeN(i_textbox_array);
 
   /* TEXT ON CURVE */
-  /* NOTE: Only OB_CURVE objects could have a path. */
-  if (cu->textoncurve && cu->textoncurve->type == OB_CURVE) {
+  /* NOTE: Only OB_CURVES_LEGACY objects could have a path. */
+  if (cu->textoncurve && cu->textoncurve->type == OB_CURVES_LEGACY) {
     BLI_assert(cu->textoncurve->runtime.curve_cache != NULL);
     if (cu->textoncurve->runtime.curve_cache != NULL &&
         cu->textoncurve->runtime.curve_cache->anim_path_accum_length != NULL) {