[Bf-blender-cvs] [cfe5424] master: Correct recent cleanup

[Campbell Barton]

Commit: cfe54245a8c37bbd9b5df3ad0d972e59d70d6906
Author: Campbell Barton
Date:   Fri May 15 11:29:34 2015 +1000
Branches: master
https://developer.blender.org/rBcfe54245a8c37bbd9b5df3ad0d972e59d70d6906

Correct recent cleanup

Removed call which was still needed

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

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

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

diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 4b90abe..3f0dac5 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1427,7 +1427,7 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but,
 		if (down || top) {
 			if (dir1 == UI_DIR_UP   && top == 0)  dir1 = UI_DIR_DOWN;
 			if (dir1 == UI_DIR_DOWN && down == 0) dir1 = UI_DIR_UP;
-			/* dir2 is never set to UI_DIR_UP here */
+			BLI_assert(dir2 != UI_DIR_UP);
 //			if (dir2 == UI_DIR_UP   && top == 0)  dir2 = UI_DIR_DOWN;
 			if (dir2 == UI_DIR_DOWN && down == 0) dir2 = UI_DIR_UP;
 		}
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 2cab1ae..20ce18b 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -3214,6 +3214,7 @@ void uiTemplateList(
 
 			/* add scrollbar */
 			if (len > layoutdata.visual_items) {
+				/* col = */ uiLayoutColumn(row, false);
 				uiDefButI(block, UI_BTYPE_SCROLL, 0, "", 0, 0, UI_UNIT_X * 0.75, UI_UNIT_Y * dyn_data->visual_height,
 				          &ui_list->list_scroll, 0, dyn_data->height - dyn_data->visual_height,
 				          dyn_data->visual_height, 0, "");