[Bf-blender-cvs] [1e1cc14] asset-engine: Merge branch 'asset-experiments' into asset-engine
Bastien Montagne
noreply at git.blender.org
Tue Jun 16 18:11:39 CEST 2015
Commit: 1e1cc1409baca4eff13e4d0e3e08ea7fdcd32884
Author: Bastien Montagne
Date: Tue Jun 16 18:11:21 2015 +0200
Branches: asset-engine
https://developer.blender.org/rB1e1cc1409baca4eff13e4d0e3e08ea7fdcd32884
Merge branch 'asset-experiments' into asset-engine
Conflicts:
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filelist.h
source/blender/editors/space_file/space_file.c
===================================================================
===================================================================
diff --cc source/blender/editors/space_file/file_draw.c
index aa8fa7a,42f5e67..b8fb2df
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@@ -492,7 -492,7 +492,7 @@@ void file_draw_list(const bContext *C,
const bool small_size = SMALL_SIZE_CHECK(params->thumbnail_size);
const bool update_stat_strings = small_size != SMALL_SIZE_CHECK(layout->curr_size);
- numfiles = filelist_numfiles(files);
- numfiles = filelist_files_ensure(files);
++ numfiles = filelist_files_ensure(files, params);
if (params->display != FILE_IMGDISPLAY) {
diff --cc source/blender/editors/space_file/file_ops.c
index 815b649,a26571a..7a42871
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@@ -101,7 -99,7 +101,7 @@@ static void file_deselect_all(SpaceFil
{
FileSelection sel;
sel.first = 0;
- sel.last = filelist_numfiles(sfile->files) - 1;
- sel.last = filelist_files_ensure(sfile->files) - 1;
++ sel.last = filelist_files_ensure(sfile->files, ED_fileselect_get_params(sfile)) - 1;
filelist_entries_select_index_range_set(sfile->files, &sel, FILE_SEL_REMOVE, flag, CHECK_ALL);
}
@@@ -141,7 -139,7 +141,7 @@@ static FileSelection file_selection_get
{
ARegion *ar = CTX_wm_region(C);
SpaceFile *sfile = CTX_wm_space_file(C);
- int numfiles = filelist_numfiles(sfile->files);
- int numfiles = filelist_files_ensure(sfile->files);
++ int numfiles = filelist_files_ensure(sfile->files, ED_fileselect_get_params(sfile));
FileSelection sel;
sel = find_file_mouse_rect(sfile, ar, rect);
@@@ -170,7 -168,7 +170,7 @@@ static FileSelect file_select_do(bConte
FileSelect retval = FILE_SELECT_NOTHING;
SpaceFile *sfile = CTX_wm_space_file(C);
FileSelectParams *params = ED_fileselect_get_params(sfile);
- int numfiles = filelist_numfiles(sfile->files);
- int numfiles = filelist_files_ensure(sfile->files);
++ int numfiles = filelist_files_ensure(sfile->files, ED_fileselect_get_params(sfile));
const FileDirEntry *file;
/* make the selected file active */
@@@ -226,9 -224,9 +226,8 @@@
/**
* \warning: loops over all files so better use cautiously
*/
--static bool file_is_any_selected(struct FileList *files)
++static bool file_is_any_selected(struct FileList *files, const int numfiles)
{
- const int numfiles = filelist_numfiles(files);
- const int numfiles = filelist_files_ensure(files);
int i;
/* Is any file selected ? */
@@@ -248,7 -246,7 +247,8 @@@ static FileSelect file_select(bContext
FileSelect retval = FILE_SELECT_NOTHING;
FileSelection sel = file_selection_get(C, rect, fill); /* get the selection */
const FileCheckType check_type = (sfile->params->flag & FILE_DIRSEL_ONLY) ? CHECK_DIRS : CHECK_ALL;
--
++ const int numfiles = filelist_files_ensure(sfile->files, ED_fileselect_get_params(sfile));
++
/* flag the files as selected in the filelist */
filelist_entries_select_index_range_set(sfile->files, &sel, select, FILE_SEL_SELECTED, check_type);
@@@ -263,7 -261,7 +263,7 @@@
}
}
-- if (select != FILE_SEL_ADD && !file_is_any_selected(sfile->files)) {
++ if (select != FILE_SEL_ADD && !file_is_any_selected(sfile->files, numfiles)) {
sfile->params->active_file = -1;
}
@@@ -423,8 -420,9 +422,9 @@@ static int file_select_invoke(bContext
if (sfile && sfile->params) {
int idx = sfile->params->highlight_file;
- int numfiles = filelist_files_ensure(sfile->files);
++ int numfiles = filelist_files_ensure(sfile->files, ED_fileselect_get_params(sfile));
- if (idx >= 0) {
+ if ((idx >= 0) && (idx < numfiles)) {
struct FileDirEntry *file = filelist_file(sfile->files, idx);
if (FILENAME_IS_CURRPAR(file->relpath)) {
/* skip - If a readonly file (".." or ".") is selected, skip deselect all! */
@@@ -573,8 -571,8 +573,8 @@@ static bool file_walk_select_do
const bool extend, const bool fill)
{
struct FileList *files = sfile->files;
- const int numfiles = filelist_numfiles(files);
- const int numfiles = filelist_files_ensure(files);
-- const bool has_selection = file_is_any_selected(files);
++ const int numfiles = filelist_files_ensure(files, ED_fileselect_get_params(sfile));
++ const bool has_selection = file_is_any_selected(files, numfiles);
const int active_old = params->active_file;
int active_new = -1;
int other_site = -1; /* file on the other site of active_old */
@@@ -687,8 -685,8 +687,8 @@@ static int file_select_all_exec(bContex
ScrArea *sa = CTX_wm_area(C);
SpaceFile *sfile = CTX_wm_space_file(C);
FileSelection sel;
- const int numfiles = filelist_numfiles(sfile->files);
- const int numfiles = filelist_files_ensure(sfile->files);
-- const bool has_selection = file_is_any_selected(sfile->files);
++ const int numfiles = filelist_files_ensure(sfile->files, ED_fileselect_get_params(sfile));
++ const bool has_selection = file_is_any_selected(sfile->files, numfiles);
sel.first = 0;
sel.last = numfiles - 1;
@@@ -1024,8 -1022,8 +1024,8 @@@ int file_highlight_set(SpaceFile *sfile
if (sfile == NULL || sfile->files == NULL) return 0;
- numfiles = filelist_numfiles(sfile->files);
- numfiles = filelist_files_ensure(sfile->files);
params = ED_fileselect_get_params(sfile);
++ numfiles = filelist_files_ensure(sfile->files, params);
origfile = params->highlight_file;
@@@ -1330,9 -1264,10 +1330,10 @@@ int file_exec(bContext *C, wmOperator *
/* when used as a macro, for doubleclick,
* to prevent closing when doubleclicking on .. item */
if (RNA_boolean_get(exec_op->ptr, "need_active")) {
- const int numfiles = filelist_files_ensure(sfile->files);
++ const int numfiles = filelist_files_ensure(sfile->files, ED_fileselect_get_params(sfile));
int i, active = 0;
- for (i = 0; i < filelist_numfiles(sfile->files); i++) {
+ for (i = 0; i < numfiles; i++) {
if (filelist_entry_select_index_get(sfile->files, i, CHECK_ALL)) {
active = 1;
break;
@@@ -1525,7 -1460,7 +1526,7 @@@ static int file_smoothscroll_invoke(bCo
if (sfile->smoothscroll_timer == NULL || sfile->smoothscroll_timer != event->customdata)
return OPERATOR_PASS_THROUGH;
- numfiles = filelist_numfiles(sfile->files);
- numfiles = filelist_files_ensure(sfile->files);
++ numfiles = filelist_files_ensure(sfile->files, ED_fileselect_get_params(sfile));
/* check if we are editing a name */
for (i = 0; i < numfiles; ++i) {
@@@ -2021,7 -1956,7 +2022,7 @@@ static int file_rename_exec(bContext *C
if (sfile->params) {
int idx = sfile->params->highlight_file;
- int numfiles = filelist_numfiles(sfile->files);
- int numfiles = filelist_files_ensure(sfile->files);
++ int numfiles = filelist_files_ensure(sfile->files, sfile->params);
if ( (0 <= idx) && (idx < numfiles) ) {
FileDirEntry *file = filelist_file(sfile->files, idx);
filelist_entry_select_index_set(sfile->files, idx, FILE_SEL_ADD, FILE_SEL_EDITING, CHECK_ALL);
@@@ -2042,11 -1977,12 +2043,12 @@@ static int file_rename_poll(bContext *C
if (sfile && sfile->params) {
int idx = sfile->params->highlight_file;
- int numfiles = filelist_files_ensure(sfile->files);
++ int numfiles = filelist_files_ensure(sfile->files, sfile->params);
- if (idx >= 0) {
+ if ((0 <= idx) && (idx < numfiles)) {
FileDirEntry *file = filelist_file(sfile->files, idx);
if (FILENAME_IS_CURRPAR(file->relpath)) {
- poll = 0;
+ poll = false;
}
}
@@@ -2083,7 -2023,7 +2089,7 @@@ static int file_delete_poll(bContext *C
if (sfile && sfile->params) {
char dir[FILE_MAX];
- int numfiles = filelist_numfiles(sfile->files);
- int numfiles = filelist_files_ensure(sfile->files);
++ int numfiles = filelist_files_ensure(sfile->files, sfile->params);
int i;
int num_selected = 0;
@@@ -2110,7 -2050,7 +2116,7 @@@ int file_delete_exec(bContext *C, wmOpe
SpaceFile *sfile = CTX_wm_space_file(C);
ScrArea *sa = CTX_wm_area(C);
FileDirEntry *file;
- int numfiles = filelist_numfiles(sfile->files);
- int numfiles = filelist_files_ensure(sfile->files);
++ int numfiles = filelist_files_ensure(sfile->files, ED_fileselect_get_params(sfile));
int i;
for (i = 0; i < numfiles; i++) {
diff --cc source/blender/editors/space_file/filelist.c
index e3185b6,d7c10cb..8edd1b9
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@@ -495,17 -499,29 +504,17 @@@ static int compare_extension(void *UNUS
return BLI_natstrcmp(name1, name2);
}
- bool filelist_need_sorting(struct FileList *filelist)
-void filelist_sort(struct FileList *filelist)
++static bool filelist_need_sorting(struct FileList *filelist)
{
- return ((filelist->need_sorting || (filelist->ae && filelist->ae->flag & AE_DIRTY_SORTING)) &&
- if ((filelist->flags & FL_NEED_SORTING) && (filelist->sort != FILE_SORT_NONE)) {
- switch (filelist->sort) {
- case FILE_SORT_ALPHA:
- BLI_listbase_sort_r(&filelist->filelist_intern.entries, compare_name, NULL);
- break;
- case FILE_SORT_TIME:
- BLI_listbase_sort_r(&filelist->filelist_intern.entries, compare_date, NULL);
- break;
- case FILE_SORT_SIZE:
- BLI_listbase_sort_r(&filelist->filelist_intern.entries, compare_size, NULL);
- break;
- case FILE_SORT_EXTENSION:
- BLI_listbase_sort_r(&filelist->filelist_intern.entries, compare_extension, NULL);
- break;
- case FILE_SORT_NONE: /* Should never reach this point! */
- default:
- BLI_assert(0);
- }
++ return (((filelist->flags & FL_NEED_SORTING) || (filelist->ae && (filelist->ae->flag & AE_DIRTY_SORTING))) &&
+ (filelist->sort != FILE_SORT_NONE));
+}
- filelist_filter_clear(filelist);
- filelist->flags &= ~FL_NEED_SORTING;
+static void filelist_need_sorting_clear(struct FileList *filelist)
+{
- filelist->need_sorting = false;
++ filelist->flags &= ~FL_NEED_SORTING;
+ if (filelist->ae) {
+ filelist->ae->flag &= ~AE_DIRTY_SORTING;
}
}
@@@ -648,20 -664,57 +657,20 @@@ static bool is_filtered_main(FileListIn
static void filelist_filter_clear(FileList *filelist)
{
- filelist->need_fi
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list