nrupsis/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

me-main #1

Merged
Nate Rupsis merged 123 commits from me-main into main 2023-02-13 18:39:11 +01:00
Conversation 0 Commits 123 Files Changed 969 +20 -18
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5c4e1ed578 - Show all commits

18
source/blender/makesrna/intern/rna_curve.c
View File

@ -1073,19 +1073,19 @@ static void rna_def_font(BlenderRNA *UNUSED(brna), StructRNA *srna)
}; };
static const EnumPropertyItem prop_align_y_items[] = { static const EnumPropertyItem prop_align_y_items[] = {
{CU_ALIGN_Y_TOP, "TOP", ICON_ALIGN_TOP, "Top", "Align text to the top"},
{CU_ALIGN_Y_TOP_BASELINE, {CU_ALIGN_Y_TOP_BASELINE,
"TOP_BASELINE", "TOP_BASELINE",
ICON_ALIGN_TOP, ICON_ALIGN_TOP,
"Top Base-Line", "Top Baseline",
"Align to top but use the base-line of the text"}, "Align text to the top line's baseline"},
{CU_ALIGN_Y_TOP, "TOP", ICON_ALIGN_TOP, "Top", "Align text to the top"}, {CU_ALIGN_Y_CENTER, "CENTER", ICON_ALIGN_MIDDLE, "Middle", "Align text to the middle"},
{CU_ALIGN_Y_CENTER, "CENTER", ICON_ALIGN_MIDDLE, "Center", "Align text to the middle"},
{CU_ALIGN_Y_BOTTOM, "BOTTOM", ICON_ALIGN_BOTTOM, "Bottom", "Align text to the bottom"},
{CU_ALIGN_Y_BOTTOM_BASELINE, {CU_ALIGN_Y_BOTTOM_BASELINE,
"BOTTOM_BASELINE", "BOTTOM_BASELINE",
ICON_ALIGN_BOTTOM, ICON_ALIGN_BOTTOM,
"Bottom Base-Line", "Bottom Baseline",
"Align text to the bottom but use the base-line of the text"}, "Align text to the bottom line's baseline"},
{CU_ALIGN_Y_BOTTOM, "BOTTOM", ICON_ALIGN_BOTTOM, "Bottom", "Align text to the bottom"},
{0, NULL, 0, NULL, NULL}, {0, NULL, 0, NULL, NULL},
}; };
@ -1109,14 +1109,14 @@ static void rna_def_font(BlenderRNA *UNUSED(brna), StructRNA *srna)
RNA_def_property_enum_sdna(prop, NULL, "spacemode"); RNA_def_property_enum_sdna(prop, NULL, "spacemode");
RNA_def_property_enum_items(prop, prop_align_items); RNA_def_property_enum_items(prop, prop_align_items);
RNA_def_property_ui_text( RNA_def_property_ui_text(
prop, "Text Horizontal Align", "Text horizontal align from the object center"); prop, "Horizontal Alignment", "Text horizontal alignment from the object center");
RNA_def_property_update(prop, 0, "rna_Curve_update_data"); RNA_def_property_update(prop, 0, "rna_Curve_update_data");
prop = RNA_def_property(srna, "align_y", PROP_ENUM, PROP_NONE); prop = RNA_def_property(srna, "align_y", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "align_y"); RNA_def_property_enum_sdna(prop, NULL, "align_y");
RNA_def_property_enum_items(prop, prop_align_y_items); RNA_def_property_enum_items(prop, prop_align_y_items);
RNA_def_property_ui_text( RNA_def_property_ui_text(
prop, "Text Vertical Align", "Text vertical align from the object center"); prop, "Vertical Alignment", "Text vertical alignment from the object center");
RNA_def_property_update(prop, 0, "rna_Curve_update_data"); RNA_def_property_update(prop, 0, "rna_Curve_update_data");
prop = RNA_def_property(srna, "overflow", PROP_ENUM, PROP_NONE); prop = RNA_def_property(srna, "overflow", PROP_ENUM, PROP_NONE);

20
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -10711,16 +10711,16 @@ static void def_geo_string_to_curves(StructRNA *srna)
}; };
static const EnumPropertyItem rna_node_geometry_string_to_curves_align_y_items[] = { static const EnumPropertyItem rna_node_geometry_string_to_curves_align_y_items[] = {
{GEO_NODE_STRING_TO_CURVES_ALIGN_Y_TOP_BASELINE,
"TOP_BASELINE",
ICON_ALIGN_TOP,
"Top Baseline",
"Align text to the top baseline"},
{GEO_NODE_STRING_TO_CURVES_ALIGN_Y_TOP, {GEO_NODE_STRING_TO_CURVES_ALIGN_Y_TOP,
"TOP", "TOP",
ICON_ALIGN_TOP, ICON_ALIGN_TOP,
"Top", "Top",
"Align text to the top"}, "Align text to the top"},
{GEO_NODE_STRING_TO_CURVES_ALIGN_Y_TOP_BASELINE,
"TOP_BASELINE",
ICON_ALIGN_TOP,
"Top Baseline",
"Align text to the top line's baseline"},
{GEO_NODE_STRING_TO_CURVES_ALIGN_Y_MIDDLE, {GEO_NODE_STRING_TO_CURVES_ALIGN_Y_MIDDLE,
"MIDDLE", "MIDDLE",
ICON_ALIGN_MIDDLE, ICON_ALIGN_MIDDLE,
@ -10730,7 +10730,7 @@ static void def_geo_string_to_curves(StructRNA *srna)
"BOTTOM_BASELINE", "BOTTOM_BASELINE",
ICON_ALIGN_BOTTOM, ICON_ALIGN_BOTTOM,
"Bottom Baseline", "Bottom Baseline",
"Align text to the bottom baseline"}, "Align text to the bottom line's baseline"},
{GEO_NODE_STRING_TO_CURVES_ALIGN_Y_BOTTOM, {GEO_NODE_STRING_TO_CURVES_ALIGN_Y_BOTTOM,
"BOTTOM", "BOTTOM",
ICON_ALIGN_BOTTOM, ICON_ALIGN_BOTTOM,
@ -10782,21 +10782,23 @@ static void def_geo_string_to_curves(StructRNA *srna)
RNA_def_property_enum_sdna(prop, NULL, "overflow"); RNA_def_property_enum_sdna(prop, NULL, "overflow");
RNA_def_property_enum_items(prop, rna_node_geometry_string_to_curves_overflow_items); RNA_def_property_enum_items(prop, rna_node_geometry_string_to_curves_overflow_items);
RNA_def_property_enum_default(prop, GEO_NODE_STRING_TO_CURVES_MODE_OVERFLOW); RNA_def_property_enum_default(prop, GEO_NODE_STRING_TO_CURVES_MODE_OVERFLOW);
RNA_def_property_ui_text(prop, "Overflow", ""); RNA_def_property_ui_text(prop, "Textbox Overflow", "Handle the text behavior when it doesn't fit in the text boxes");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
prop = RNA_def_property(srna, "align_x", PROP_ENUM, PROP_NONE); prop = RNA_def_property(srna, "align_x", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "align_x"); RNA_def_property_enum_sdna(prop, NULL, "align_x");
RNA_def_property_enum_items(prop, rna_node_geometry_string_to_curves_align_x_items); RNA_def_property_enum_items(prop, rna_node_geometry_string_to_curves_align_x_items);
RNA_def_property_enum_default(prop, GEO_NODE_STRING_TO_CURVES_ALIGN_X_LEFT); RNA_def_property_enum_default(prop, GEO_NODE_STRING_TO_CURVES_ALIGN_X_LEFT);
RNA_def_property_ui_text(prop, "Align X", ""); RNA_def_property_ui_text(
prop, "Horizontal Alignment", "Text horizontal alignment from the object center");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "align_y", PROP_ENUM, PROP_NONE); prop = RNA_def_property(srna, "align_y", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "align_y"); RNA_def_property_enum_sdna(prop, NULL, "align_y");
RNA_def_property_enum_items(prop, rna_node_geometry_string_to_curves_align_y_items); RNA_def_property_enum_items(prop, rna_node_geometry_string_to_curves_align_y_items);
RNA_def_property_enum_default(prop, GEO_NODE_STRING_TO_CURVES_ALIGN_Y_TOP_BASELINE); RNA_def_property_enum_default(prop, GEO_NODE_STRING_TO_CURVES_ALIGN_Y_TOP_BASELINE);
RNA_def_property_ui_text(prop, "Align Y", ""); RNA_def_property_ui_text(
prop, "Vertical Alignment", "Text vertical alignment from the object center");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "pivot_mode", PROP_ENUM, PROP_NONE); prop = RNA_def_property(srna, "pivot_mode", PROP_ENUM, PROP_NONE);