diff options
author | Yevgeny Makarov <jenkm> | 2020-10-29 17:56:43 +0300 |
---|---|---|
committer | Harley Acheson <harley.acheson@gmail.com> | 2020-10-29 18:16:34 +0300 |
commit | 962a0a6c6614229d9e49b3b012bbee1dc9bb34b4 (patch) | |
tree | 537438429feb6601cbc12d3c86e46a2f449fa951 | |
parent | f75b09e7e6b3ed9345993455ecab8a6d1690179f (diff) |
Allow Building Without UI_PROP_DECORATE
Allow project to build without definition of optional UI_PROP_DECORATE.
Differential Revision: https://developer.blender.org/D8370
Reviewed by Julian Eisel
-rw-r--r-- | source/blender/editors/interface/interface_layout.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index cf589e43858..efb29fe75c3 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -964,7 +964,11 @@ static uiBut *ui_item_with_label(uiLayout *layout, UI_block_layout_set_current(block, layout); /* Only add new row if more than 1 item will be added. */ - if (name[0] || use_prop_decorate) { + if (name[0] +#ifdef UI_PROP_DECORATE + || use_prop_decorate +#endif + ) { /* Also avoid setting 'align' if possible. Set the space to zero instead as aligning a large * number of labels can end up aligning thousands of buttons when displaying key-map search (a * heavy operation), see: T78636. */ @@ -972,8 +976,8 @@ static uiBut *ui_item_with_label(uiLayout *layout, sub->space = 0; } -#ifdef UI_PROP_DECORATE if (name[0]) { +#ifdef UI_PROP_DECORATE if (use_prop_sep) { layout_prop_decorate = uiItemL_respect_property_split(layout, name, 0); } |