3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index b4fdb1a5828..763f06bef21 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1422,7 +1422,7 @@ static void outliner_draw_hierarchy(SpaceOops *soops, ListBase *lb, int startx,
 	TreeStoreElem *tselem;
 	int y1, y2;
 	
-	if (lb->first == NULL) return;
+	if (BLI_listbase_is_empty(lb)) return;
 	
 	y1 = y2 = *starty; /* for vertical lines between objects */
 	for (te = lb->first; te; te = te->next) {
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 036db3bae91..4231dc6f9f8 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -1342,7 +1342,7 @@ static void outliner_sort(SpaceOops *soops, ListBase *lb)
 					qsort(tear + skip, totelem - skip, sizeof(tTreeSort), treesort_alpha_ob);
 			}
 			
-			lb->first = lb->last = NULL;
+			BLI_listbase_clear(lb);
 			tp = tear;
 			while (totelem--) {
 				BLI_addtail(lb, tp->te);
@@ -1443,7 +1443,7 @@ static int outliner_filter_tree(SpaceOops *soops, ListBase *lb)
 	}
 	
 	/* if there are still items in the list, that means that there were still some matches */
-	return (lb->first != NULL);
+	return (BLI_listbase_is_empty(lb) == false);
 }
 
 static void outliner_add_library_contents(Main *mainvar, SpaceOops *soops, TreeElement *te, Library *lib)
diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c
index 3a7d001f432..1f7415a3a56 100644
--- a/source/blender/editors/space_outliner/space_outliner.c
+++ b/source/blender/editors/space_outliner/space_outliner.c
@@ -451,7 +451,7 @@ static SpaceLink *outliner_duplicate(SpaceLink *sl)
 	SpaceOops *soutliner = (SpaceOops *)sl;
 	SpaceOops *soutlinern = MEM_dupallocN(soutliner);
 
-	soutlinern->tree.first = soutlinern->tree.last = NULL;
+	BLI_listbase_clear(&soutlinern->tree);
 	soutlinern->treestore = NULL;
 	soutlinern->treehash = NULL;