diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-03-17 17:34:35 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-03-17 17:38:45 +0300 |
| commit | a96008f3aae2b047ce777418e45eeae09e0ea4e6 (patch) | |
| tree | e9a227675344d3fe5367a62835f529633c363a40 /source/blender/editors/screen/area.c | |
| parent | 4b190e312f251d9e519c84af1dc5c65f3ab3a4fd (diff) | |
| parent | 9d873fc3debe03e87eb514f51fddf29ee76983b3 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_outliner/outliner_draw.c
Diffstat (limited to 'source/blender/editors/screen/area.c')
| -rw-r--r-- | source/blender/editors/screen/area.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index f0364735247..7e1fda6d095 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1795,7 +1795,7 @@ int ED_area_header_switchbutton(const bContext *C, uiBlock *block, int yco) RNA_pointer_create(&(scr->id), &RNA_Area, sa, &areaptr); - uiDefButR(block, UI_BTYPE_MENU, 0, "", xco, yco, 1.5 * U.widget_unit, U.widget_unit, + uiDefButR(block, UI_BTYPE_MENU, 0, "", xco, yco, 1.6 * U.widget_unit, U.widget_unit, &areaptr, "type", 0, 0.0f, 0.0f, 0.0f, 0.0f, ""); return xco + 1.7 * U.widget_unit; |