[Bf-blender-cvs] [f970994] asset-experiments: Some minor cleanups.

Bastien Montagne noreply at git.blender.org
Tue Mar 31 16:03:40 CEST 2015


Commit: f970994cd39bc76a2f25cc760a22c30b0f76b94d
Author: Bastien Montagne
Date:   Tue Mar 31 15:42:51 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBf970994cd39bc76a2f25cc760a22c30b0f76b94d

Some minor cleanups.

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

M	source/blender/editors/space_file/filelist.c

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

diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 8c28df8..0b6a4f1 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -265,8 +265,6 @@ typedef struct FileList {
 	bool need_sorting;
 
 	FileListFilter filter_data;
-//	FileDirEntry **filtered;
-//	int numfiltered;
 	bool need_filtering;
 
 	struct FileListIntern filelist_intern;
@@ -648,8 +646,6 @@ static bool is_filtered_main(FileDirEntry *file, const char *UNUSED(dir), FileLi
 static void filelist_filter_clear(FileList *filelist)
 {
 	filelist->need_filtering = true;
-//	MEM_SAFE_FREE(filelist->filtered);
-//	filelist->numfiltered = 0;
 }
 
 void filelist_filter(FileList *filelist)
@@ -2325,8 +2321,6 @@ static void filelist_readjob_startjob(void *flrjv, short *stop, short *do_update
 	flrj->tmp_filelist->filelist_cache.misc_entries = NULL;
 	flrj->tmp_filelist->filelist_intern.filtered = NULL;
 	BLI_listbase_clear(&flrj->tmp_filelist->filelist_intern.entries);
-//	flrj->tmp_filelist->filtered = NULL;
-//	flrj->tmp_filelist->numfiltered = 0;
 	flrj->tmp_filelist->libfiledata = NULL;
 
 	flrj->tmp_filelist->read_jobf(flrj->tmp_filelist, flrj->main_name, stop, do_update, progress, &flrj->lock);
@@ -2382,7 +2376,6 @@ static void filelist_readjob_free(void *flrjv)
 
 	if (flrj->tmp_filelist) {
 		/* tmp_filelist shall never ever be filtered! */
-//		BLI_assert(flrj->tmp_filelist->filtered == NULL);
 		BLI_assert(flrj->tmp_filelist->filelist.nbr_entries == 0);
 		BLI_assert(BLI_listbase_is_empty(&flrj->tmp_filelist->filelist.entries));




More information about the Bf-blender-cvs mailing list