[Bf-blender-cvs] [5c65957] master: Fix T45847: Pie looses focus when mouse cursor passes through a pie button

Julian Eisel noreply at git.blender.org
Wed Aug 19 20:55:20 CEST 2015


Commit: 5c659574e643ff825ec02bafad7d7909fb287b4a
Author: Julian Eisel
Date:   Wed Aug 19 20:53:16 2015 +0200
Branches: master
https://developer.blender.org/rB5c659574e643ff825ec02bafad7d7909fb287b4a

Fix T45847: Pie looses focus when mouse cursor passes through a pie button

===================================================================

M	source/blender/editors/interface/interface.c

===================================================================

diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index e435d40..dcf1143 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -223,7 +223,7 @@ void ui_region_to_window(const ARegion *ar, int *x, int *y)
 void ui_region_winrct_get_no_margin(const struct ARegion *ar, struct rcti *r_rect)
 {
 	uiBlock *block = ar->uiblocks.first;
-	if (block && block->flag & UI_BLOCK_LOOP) {
+	if (block && (block->flag & UI_BLOCK_LOOP) && (block->flag & UI_BLOCK_RADIAL) == 0) {
 		BLI_rcti_rctf_copy_floor(r_rect, &block->rect);
 		BLI_rcti_translate(r_rect, ar->winrct.xmin, ar->winrct.ymin);
 	}




More information about the Bf-blender-cvs mailing list