[Bf-blender-cvs] [6c5e2ac] master: Cleanup: remove unused UI_SHIFT_FLIPPED (2.4x toolbox)

[Campbell Barton]

Commit: 6c5e2ac7e666e6fac5b831a16c337eabbd88f4f6
Author: Campbell Barton
Date:   Sun Nov 9 17:16:46 2014 +0100
Branches: master
https://developer.blender.org/rB6c5e2ac7e666e6fac5b831a16c337eabbd88f4f6

Cleanup: remove unused UI_SHIFT_FLIPPED (2.4x toolbox)

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

M	source/blender/editors/include/UI_interface.h
M	source/blender/editors/interface/interface_regions.c

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

diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 3704315..e8cca24 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -111,7 +111,6 @@ typedef struct uiLayout uiLayout;
 #define UI_LEFT            (1 << 2)
 #define UI_RIGHT           (1 << 3)
 #define UI_CENTER          (1 << 4)
-#define UI_SHIFT_FLIPPED   (1 << 5)
 
 #if 0
 /* uiBlock->autofill (not yet used) */
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 097dbe9..d863845 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1377,7 +1377,7 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but,
 	/* aspect /= (float)xsize;*/ /*UNUSED*/
 
 	{
-		int left = 0, right = 0, top = 0, down = 0;
+		bool left = 0, right = 0, top = 0, down = 0;
 		int winx, winy;
 		// int offscreen;
 
@@ -1444,8 +1444,6 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but,
 			else xof = butrct.xmin - block->rect.xmin;
 			/* changed direction? */
 			if ((dir1 & block->direction) == 0) {
-				if (block->direction & UI_SHIFT_FLIPPED)
-					xof += dir2 == UI_LEFT ? 25 : -25;
 				uiBlockFlipOrder(block);
 			}
 		}
@@ -1455,8 +1453,6 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but,
 			else xof = butrct.xmin - block->rect.xmin;
 			/* changed direction? */
 			if ((dir1 & block->direction) == 0) {
-				if (block->direction & UI_SHIFT_FLIPPED)
-					xof += dir2 == UI_LEFT ? 25 : -25;
 				uiBlockFlipOrder(block);
 			}
 		}