archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-07-01 16:22:06 +02:00
parent bc95c7a3ea ddee0931b8
commit 36a9436d80
69 changed files with 444 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/interface/interface_layout.c
View File

@@ -393,7 +393,7 @@ static int ui_layout_local_dir(uiLayout *layout)
}
}
static uiLayout *ui_item_local_sublayout(uiLayout *test, uiLayout *layout, int align)
static uiLayout *ui_item_local_sublayout(uiLayout *test, uiLayout *layout, bool align)
{
uiLayout *sub;
@@ -564,7 +564,7 @@ static void ui_item_array(
uiDefAutoButR(block, ptr, prop, -1, "", ICON_NONE, 0, 0, w, UI_UNIT_Y);
}
else {
int *boolarr = NULL;
bool *boolarr = NULL;
/* even if 'expand' is fale, expanding anyway */
@@ -579,7 +579,7 @@ static void ui_item_array(
/* show checkboxes for rna on a non-emboss block (menu for eg) */
if (type == PROP_BOOLEAN && ELEM(layout->root->block->dt, UI_EMBOSS_NONE, UI_EMBOSS_PULLDOWN)) {
boolarr = MEM_callocN(sizeof(int) * len, __func__);
boolarr = MEM_callocN(sizeof(bool) * len, __func__);
RNA_property_boolean_get_array(ptr, prop, boolarr);
}
@@ -3533,7 +3533,7 @@ static void ui_litem_init_from_parent(uiLayout *litem, uiLayout *layout, int ali
}
/* layout create functions */
uiLayout *uiLayoutRow(uiLayout *layout, int align)
uiLayout *uiLayoutRow(uiLayout *layout, bool align)
{
uiLayout *litem;
@@ -3548,7 +3548,7 @@ uiLayout *uiLayoutRow(uiLayout *layout, int align)
return litem;
}
uiLayout *uiLayoutColumn(uiLayout *layout, int align)
uiLayout *uiLayoutColumn(uiLayout *layout, bool align)
{
uiLayout *litem;
@@ -3563,7 +3563,7 @@ uiLayout *uiLayoutColumn(uiLayout *layout, int align)
return litem;
}
uiLayout *uiLayoutColumnFlow(uiLayout *layout, int number, int align)
uiLayout *uiLayoutColumnFlow(uiLayout *layout, int number, bool align)
{
uiLayoutItemFlow *flow;
@@ -3580,7 +3580,7 @@ uiLayout *uiLayoutColumnFlow(uiLayout *layout, int number, int align)
}
uiLayout *uiLayoutGridFlow(
uiLayout *layout, int row_major, int columns_len, int even_columns, int even_rows, int align)
uiLayout *layout, bool row_major, int columns_len, bool even_columns, bool even_rows, bool align)
{
uiLayoutItemGridFlow *flow;
@@ -3689,7 +3689,7 @@ uiLayout *uiLayoutListBox(
return (uiLayout *)box;
}
uiLayout *uiLayoutAbsolute(uiLayout *layout, int align)
uiLayout *uiLayoutAbsolute(uiLayout *layout, bool align)
{
uiLayout *litem;
@@ -3727,7 +3727,7 @@ uiLayout *uiLayoutOverlap(uiLayout *layout)
return litem;
}
uiLayout *uiLayoutSplit(uiLayout *layout, float percentage, int align)
uiLayout *uiLayoutSplit(uiLayout *layout, float percentage, bool align)
{
uiLayoutItemSplit *split;