[Bf-blender-cvs] [46903fb] asset-experiments: Merge branch 'id-remap' into asset-experiments

[Bastien Montagne]

Commit: 46903fbccfcbe732b4722026962f6db009221492
Author: Bastien Montagne
Date:   Fri Feb 12 10:05:56 2016 +0100
Branches: asset-experiments
https://developer.blender.org/rB46903fbccfcbe732b4722026962f6db009221492

Merge branch 'id-remap' into asset-experiments

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



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

diff --cc source/blender/blenkernel/intern/library.c
index 159754b,ea126bf..4d78e09
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -2052,9 -2052,9 +2052,10 @@@ void id_clear_lib_data_ex(Main *bmain, 
  	id_fake_user_clear(id);
  
  	id->lib = NULL;
 +	MEM_SAFE_FREE(id->uuid);  /* Local ID have no more use for asset-related data. */
  	id->tag &= ~(LIB_TAG_INDIRECT | LIB_TAG_EXTERN);
- 	new_id(which_libbase(bmain, GS(id->name)), id, NULL);
+ 	if (id_in_mainlist)
+ 		new_id(which_libbase(bmain, GS(id->name)), id, NULL);
  
  	/* internal bNodeTree blocks inside ID types below
  	 * also stores id->lib, make sure this stays in sync.
diff --cc source/blender/editors/space_file/file_ops.c
index 0f12eb1,ddb8b1c..f19c310
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@@ -2331,9 -2266,11 +2334,11 @@@ 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_files_ensure(sfile->files);
 +	int numfiles = filelist_files_ensure(sfile->files, ED_fileselect_get_params(sfile));
  	int i;
  
+ 	bool report_error = false;
+ 	errno = 0;
  	for (i = 0; i < numfiles; i++) {
  		if (filelist_entry_select_index_get(sfile->files, i, CHECK_FILES)) {
  			file = filelist_file(sfile->files, i);