[Bf-blender-cvs] [48eaddfae0f] blender2.8: Missed in last merge

[Campbell Barton]

Commit: 48eaddfae0f7f86d58b4fc0a8a49e2a63dd51fc9
Author: Campbell Barton
Date:   Tue Apr 3 18:22:05 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB48eaddfae0f7f86d58b4fc0a8a49e2a63dd51fc9

Missed in last merge

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

M	source/blender/blenloader/intern/versioning_280.c
M	source/blender/editors/mesh/editmesh_select.c
M	source/blender/windowmanager/intern/wm_window.c

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

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 46021a8b502..50b7f736a67 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -505,7 +505,7 @@ void do_versions_after_linking_280(Main *main)
 
 						soutliner->outlinevis = SO_VIEW_LAYER;
 
-						if (BLI_listbase_count_ex(&layer->layer_collections, 2) == 1) {
+						if (BLI_listbase_count_at_most(&layer->layer_collections, 2) == 1) {
 							if (soutliner->treestore == NULL) {
 								soutliner->treestore = BLI_mempool_create(
 								        sizeof(TreeStoreElem), 1, 512, BLI_MEMPOOL_ALLOW_ITER);
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index 513e939c529..40a64435cf3 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -2006,7 +2006,7 @@ bool EDBM_select_pick(bContext *C, const int mval[2], bool extend, bool deselect
 				const int cd_fmap_offset = CustomData_get_offset(&vc.em->bm->pdata, CD_FACEMAP);
 				if (cd_fmap_offset != -1) {
 					int map = *((int *)BM_ELEM_CD_GET_VOID_P(efa, cd_fmap_offset));
-					if ((map < -1) || (map > BLI_listbase_count_ex(&vc.obedit->fmaps, map))) {
+					if ((map < -1) || (map > BLI_listbase_count_at_most(&vc.obedit->fmaps, map))) {
 						map = -1;
 					}
 					map += 1;
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 14376b1bbb1..d482c107fe6 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -1015,7 +1015,7 @@ int wm_window_new_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(even
 	WorkSpace *workspace = WM_window_get_active_workspace(win);
 	ListBase *listbase = BKE_workspace_layouts_get(workspace);
 
-	if (BLI_listbase_count_ex(listbase, 2) == 1) {
+	if (BLI_listbase_count_at_most(listbase, 2) == 1) {
 		RNA_enum_set(op->ptr, "screen", 0);
 		return wm_window_new_exec(C, op);
 	}