[Bf-blender-cvs] [8094de8] asset-engine: Fix `filelist_file_create_entry()` adding the generated entry twice to the cached list in AE case.

[Bastien Montagne]

Commit: 8094de89ce100f807852d9bbf05f1dce88f1e660
Author: Bastien Montagne
Date:   Thu Sep 10 13:01:37 2015 +0200
Branches: asset-engine
https://developer.blender.org/rB8094de89ce100f807852d9bbf05f1dce88f1e660

Fix `filelist_file_create_entry()` adding the generated entry twice to the 
cached list in AE case.

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

M       source/blender/editors/space_file/filelist.c
M       source/blender/makesrna/intern/rna_asset.c

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

diff --git a/source/blender/editors/space_file/filelist.c 
b/source/blender/editors/space_file/filelist.c
index c07ecb0..ce5d1e2 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -1548,9 +1548,10 @@ static FileDirEntry *filelist_file_create_entry(FileList 
*filelist, const int in
                memcpy(ret->uuid, entry->uuid, sizeof(ret->uuid));
                ret->blentype = entry->blentype;
                ret->typeflag = entry->typeflag;
+
+               BLI_addtail(&cache->cached_entries, ret);
        }
 
-       BLI_addtail(&cache->cached_entries, ret);
        return ret;
 }
 
diff --git a/source/blender/makesrna/intern/rna_asset.c 
b/source/blender/makesrna/intern/rna_asset.c
index ac3b8ce..f8755a1 100644
--- a/source/blender/makesrna/intern/rna_asset.c
+++ b/source/blender/makesrna/intern/rna_asset.c
@@ -293,7 +293,7 @@ static void rna_AssetList_entries_remove(FileDirEntryArr 
*dirlist, ReportList *r
        FileDirEntry *entry = ptr->data;
 
        if (!BLI_remlink_safe(&dirlist->entries, entry)) {
-               BKE_report(reports, RPT_ERROR, "Trying to remove an entry for a 
list which does not contain it!");
+               BKE_report(reports, RPT_ERROR, "Trying to remove an entry from 
a list which does not contain it!");
                return;
        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs