diff options
| author | Yevgeny Makarov <jenkm> | 2020-10-28 02:30:37 +0300 |
|---|---|---|
| committer | Harley Acheson <harley.acheson@gmail.com> | 2020-10-28 02:30:37 +0300 |
| commit | d28676d89a79e02745ebced89152f25dbfd71285 (patch) | |
| tree | ddaf063bc081be87348e6a37b450ad1566e836c1 /release | |
| parent | 024b65b5e518b9a7c9ab3e241ef050cc962a4619 (diff) | |
UI: Move the 'Resolve Conflict' button closer to the text data-block
Moves the Text Editor 'Resolve Conflict' button closer to data-block selector and with 'Question' icon.
Differential Revision: https://developer.blender.org/D9266
Reviewed by Hans Goudey
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_text.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py index f1326823fe8..c937882bd6e 100644 --- a/release/scripts/startup/bl_ui/space_text.py +++ b/release/scripts/startup/bl_ui/space_text.py @@ -35,12 +35,12 @@ class TEXT_HT_header(Header): TEXT_MT_editor_menus.draw_collapsible(context, layout) + layout.separator_spacer() + if text and text.is_modified: row = layout.row(align=True) row.alert = True - row.operator("text.resolve_conflict", text="", icon='HELP') - - layout.separator_spacer() + row.operator("text.resolve_conflict", text="", icon='QUESTION') row = layout.row(align=True) row.template_ID(st, "text", new="text.new", |