diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-10-29 23:50:11 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-29 23:50:11 +0300 |
commit | 01171c3380c89f371508e7b629131f6714394710 (patch) | |
tree | 3909706241be1239b5dba7e42c671ae0de72c714 | |
parent | 09e813f30343695f1442bce33de811598a31b888 (diff) | |
parent | aff6446e064f9bbce99d0a6eac3cff03c6878179 (diff) |
Merge branch 'blender-v2.81-release'
-rw-r--r-- | source/blender/makesrna/intern/rna_sequencer.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 18985d41551..2c5f93e28ed 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -2699,16 +2699,17 @@ static void rna_def_gaussian_blur(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[] = { - {SEQ_TEXT_ALIGN_X_LEFT, "LEFT", ICON_ALIGN_LEFT, "Left", ""}, - {SEQ_TEXT_ALIGN_X_CENTER, "CENTER", ICON_ALIGN_CENTER, "Center", ""}, - {SEQ_TEXT_ALIGN_X_RIGHT, "RIGHT", ICON_ALIGN_RIGHT, "Right", ""}, + {SEQ_TEXT_ALIGN_X_LEFT, "LEFT", 0, "Left", ""}, + {SEQ_TEXT_ALIGN_X_CENTER, "CENTER", 0, "Center", ""}, + {SEQ_TEXT_ALIGN_X_RIGHT, "RIGHT", 0, "Right", ""}, {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem text_align_y_items[] = { - {SEQ_TEXT_ALIGN_Y_TOP, "TOP", ICON_ALIGN_TOP, "Top", ""}, - {SEQ_TEXT_ALIGN_Y_CENTER, "CENTER", ICON_ALIGN_MIDDLE, "Center", ""}, - {SEQ_TEXT_ALIGN_Y_BOTTOM, "BOTTOM", ICON_ALIGN_BOTTOM, "Bottom", ""}, + {SEQ_TEXT_ALIGN_Y_TOP, "TOP", 0, "Top", ""}, + {SEQ_TEXT_ALIGN_Y_CENTER, "CENTER", 0, "Center", ""}, + {SEQ_TEXT_ALIGN_Y_BOTTOM, "BOTTOM", 0, "Bottom", ""}, {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_items(prop, text_align_x_items); 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( 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_items(prop, text_align_y_items); 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( prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_preprocessed_update"); |