diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-05-15 04:29:34 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-15 04:29:34 +0300 |
| commit | cfe54245a8c37bbd9b5df3ad0d972e59d70d6906 (patch) | |
| tree | 9551e2cd2c8164263c1332f36a41cc4b0a110ad5 /source | |
| parent | bc371030a719725797f91c4808837258f28a986d (diff) | |
Correct recent cleanup
Removed call which was still needed
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 4b90abed82b..3f0dac5f872 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 2cab1aea83f..20ce18b2817 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, ""); |