forked from bartvdbraak/blender
Merge branch 'blender-v2.81-release'
This commit is contained in:
commit
01171c3380
@ -2699,16 +2699,17 @@ static void rna_def_gaussian_blur(StructRNA *srna)
|
|||||||
|
|
||||||
static void rna_def_text(StructRNA *srna)
|
static void rna_def_text(StructRNA *srna)
|
||||||
{
|
{
|
||||||
|
/* Avoid text icons because they imply this aligns within a frame, see: T71082 */
|
||||||
static const EnumPropertyItem text_align_x_items[] = {
|
static const EnumPropertyItem text_align_x_items[] = {
|
||||||
{SEQ_TEXT_ALIGN_X_LEFT, "LEFT", ICON_ALIGN_LEFT, "Left", ""},
|
{SEQ_TEXT_ALIGN_X_LEFT, "LEFT", 0, "Left", ""},
|
||||||
{SEQ_TEXT_ALIGN_X_CENTER, "CENTER", ICON_ALIGN_CENTER, "Center", ""},
|
{SEQ_TEXT_ALIGN_X_CENTER, "CENTER", 0, "Center", ""},
|
||||||
{SEQ_TEXT_ALIGN_X_RIGHT, "RIGHT", ICON_ALIGN_RIGHT, "Right", ""},
|
{SEQ_TEXT_ALIGN_X_RIGHT, "RIGHT", 0, "Right", ""},
|
||||||
{0, NULL, 0, NULL, NULL},
|
{0, NULL, 0, NULL, NULL},
|
||||||
};
|
};
|
||||||
static const EnumPropertyItem text_align_y_items[] = {
|
static const EnumPropertyItem text_align_y_items[] = {
|
||||||
{SEQ_TEXT_ALIGN_Y_TOP, "TOP", ICON_ALIGN_TOP, "Top", ""},
|
{SEQ_TEXT_ALIGN_Y_TOP, "TOP", 0, "Top", ""},
|
||||||
{SEQ_TEXT_ALIGN_Y_CENTER, "CENTER", ICON_ALIGN_MIDDLE, "Center", ""},
|
{SEQ_TEXT_ALIGN_Y_CENTER, "CENTER", 0, "Center", ""},
|
||||||
{SEQ_TEXT_ALIGN_Y_BOTTOM, "BOTTOM", ICON_ALIGN_BOTTOM, "Bottom", ""},
|
{SEQ_TEXT_ALIGN_Y_BOTTOM, "BOTTOM", 0, "Bottom", ""},
|
||||||
{0, NULL, 0, NULL, NULL},
|
{0, NULL, 0, NULL, NULL},
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -2765,7 +2766,7 @@ static void rna_def_text(StructRNA *srna)
|
|||||||
RNA_def_property_enum_sdna(prop, NULL, "align");
|
RNA_def_property_enum_sdna(prop, NULL, "align");
|
||||||
RNA_def_property_enum_items(prop, text_align_x_items);
|
RNA_def_property_enum_items(prop, text_align_x_items);
|
||||||
RNA_def_property_ui_text(
|
RNA_def_property_ui_text(
|
||||||
prop, "Align X", "Align the text along the X axis, relative to the text midpoint");
|
prop, "Align X", "Align the text along the X axis, relative to the text bounds");
|
||||||
RNA_def_property_update(
|
RNA_def_property_update(
|
||||||
prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_preprocessed_update");
|
prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_preprocessed_update");
|
||||||
|
|
||||||
@ -2773,7 +2774,7 @@ static void rna_def_text(StructRNA *srna)
|
|||||||
RNA_def_property_enum_sdna(prop, NULL, "align_y");
|
RNA_def_property_enum_sdna(prop, NULL, "align_y");
|
||||||
RNA_def_property_enum_items(prop, text_align_y_items);
|
RNA_def_property_enum_items(prop, text_align_y_items);
|
||||||
RNA_def_property_ui_text(
|
RNA_def_property_ui_text(
|
||||||
prop, "Align Y", "Align the image along the Y axis, relative to the text midpoint");
|
prop, "Align Y", "Align the text along the Y axis, relative to the text bounds");
|
||||||
RNA_def_property_update(
|
RNA_def_property_update(
|
||||||
prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_preprocessed_update");
|
prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_preprocessed_update");
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user