diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-10-12 17:40:35 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-10-12 17:40:35 +0300 |
| commit | 557dc7d34353992058451851a6ec1068d25b13d4 (patch) | |
| tree | 8c86daa924fdf1d8c82fb0236789b3160e016755 /source/blender/editors/include | |
| parent | 5f025a7e5e043a2dbdebf66668217fbae591ef89 (diff) | |
| parent | a51688d0b066f00d5912d677d0f4bdad08b28ea6 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/screen/screen_edit.c
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index f6826deaf3a..158cc53dfb3 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -444,7 +444,7 @@ void UI_popup_block_close(struct bContext *C, struct wmWindow *win, uiBlock *blo * */ uiBlock *UI_block_begin(const struct bContext *C, struct ARegion *region, const char *name, short dt); -void UI_block_end_ex(const struct bContext *C, uiBlock *block, const int xy[2]); +void UI_block_end_ex(const struct bContext *C, uiBlock *block, const int xy[2], int r_xy[2]); void UI_block_end(const struct bContext *C, uiBlock *block); void UI_block_draw(const struct bContext *C, struct uiBlock *block); void UI_block_update_from_old(const struct bContext *C, struct uiBlock *block); |