From 352575d6209215a1ce78bbf82389b21c176641d6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 25 Aug 2025 06:20:07 +0000 Subject: [PATCH] Cleanup: remove unused Curve::lines & disabled RNA definition --- source/blender/blenkernel/intern/vfont_curve.cc | 9 --------- source/blender/makesdna/DNA_curve_types.h | 3 +-- source/blender/makesrna/intern/rna_curve.cc | 8 -------- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/source/blender/blenkernel/intern/vfont_curve.cc b/source/blender/blenkernel/intern/vfont_curve.cc index 539f63c924a..b95a8539ff4 100644 --- a/source/blender/blenkernel/intern/vfont_curve.cc +++ b/source/blender/blenkernel/intern/vfont_curve.cc @@ -1019,15 +1019,6 @@ static bool vfont_to_curve(Object *ob, current_line_length += xof + twidth - MARGIN_X_MIN; longest_line_length = std::max(current_line_length, longest_line_length); - cu->lines = 1; - for (i = 0; i <= slen; i++) { - const char32_t charcode = mem[i]; - ct = &chartransdata[i]; - if (charcode == '\n' || ct->dobreak) { - cu->lines++; - } - } - if (ef && selboxes) { /* Set combined style flags for the selected string. Start with all styles then * remove one if ANY characters do not have it. Break out if we've removed them all. */ diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index 3102726bbb1..f69123f99dc 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -265,10 +265,9 @@ typedef struct Curve { * specified. The effective radius is a function of the bevel point radius and the taper radius. */ char taper_radius_mode; - char _pad; + char _pad[3]; /* font part */ - short lines; float spacing, linedist, shear, fsize, wordspace, ulpos, ulheight; float xof, yof; float linewidth; diff --git a/source/blender/makesrna/intern/rna_curve.cc b/source/blender/makesrna/intern/rna_curve.cc index 529b73a84ee..d25d2f0834b 100644 --- a/source/blender/makesrna/intern/rna_curve.cc +++ b/source/blender/makesrna/intern/rna_curve.cc @@ -1408,14 +1408,6 @@ static void rna_def_charinfo(BlenderRNA *brna) RNA_def_property_ui_icon(prop, ICON_UNDERLINE, 0); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - /* probably there is no reason to expose this */ -# if 0 - prop = RNA_def_property(srna, "use_wrap", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, nullptr, "flag", CU_CHINFO_WRAP); - RNA_def_property_ui_text(prop, "Wrap", ""); - RNA_def_property_update(prop, 0, "rna_Curve_update_data"); -# endif - prop = RNA_def_property(srna, "use_small_caps", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "flag", CU_CHINFO_SMALLCAPS); RNA_def_property_ui_text(prop, "Small Caps", "");