diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-22 22:15:08 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-22 22:15:08 +0400 |
commit | ac814498a213d436c2349e8ff55fe802cdb7376e (patch) | |
tree | 38c8e0ce3d844804cc6dbb35f068a315e207a8df /source/blender/editors/include | |
parent | c6391e8d2394b8d022b03f48941b235b96d677d0 (diff) | |
parent | b78701f6fe1daa33c38a7b72563565c09677f325 (diff) |
svn merge ^/trunk/blender -r42069:42076
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/UI_interface.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 458fe175fbb..ec6958c8415 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -115,6 +115,7 @@ typedef struct uiLayout uiLayout; #define UI_BLOCK_OUT_1 1024 #define UI_BLOCK_NO_FLIP 2048 #define UI_BLOCK_POPUP_MEMORY 4096 +#define UI_BLOCK_CLIP_EVENTS 8192 /* stop handling mouse events */ /* uiPopupBlockHandle->menuretval */ #define UI_RETURN_CANCEL 1 /* cancel all menus cascading */ @@ -364,6 +365,7 @@ void uiTextBoundsBlock(uiBlock *block, int addval); void uiPopupBoundsBlock(uiBlock *block, int addval, int mx, int my); void uiMenuPopupBoundsBlock(uiBlock *block, int addvall, int mx, int my); void uiCenteredBoundsBlock(uiBlock *block, int addval); +void uiExplicitBoundsBlock(uiBlock *block, int minx, int miny, int maxx, int maxy); int uiBlocksGetYMin (struct ListBase *lb); |