Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2022-02-18 18:50:29 +0300
committerHans Goudey <h.goudey@me.com>2022-02-18 18:50:29 +0300
commitddf189892c596d939228cc531b775bfd6708bb2d (patch)
treecb3b28527696ef5a6a3eec581a55e6141c2e686d /source/blender/blenkernel/intern/curve.cc
parent48b17da1d9fe4d559c5b0fa58029df05a45d3960 (diff)
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
Diffstat (limited to 'source/blender/blenkernel/intern/curve.cc')
-rw-r--r--source/blender/blenkernel/intern/curve.cc16
1 files changed, 8 insertions, 8 deletions
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);