Commit: 69ae86193c31160cd501c18cfac661ea4afb23c3
Author: Bastien Montagne
Date: Tue Jun 14 15:07:18 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB69ae86193c31160cd501c18cfac661ea4afb23c3
Merge branch 'master' into asset-engine
Conflicts:
source/blender/blenloader/intern/writefile.c
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/writefile.c
index 91ca66e,327b7b5..97f6d3c
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -3602,10 -3607,8 +3606,11 @@@ static void write_libraries(WriteData *
* quit.blend and temp saves */
if (found_one) {
writestruct(wd, ID_LI, "Library", 1, main->curlib);
+ write_iddata(wd, &main->curlib->id);
+ BLI_assert(!(main->curlib->flag & LIBRARY_FLAG_VIRTUAL)
||
+ (!main->curlib->packedfile &&
main->curlib->asset_repository));
+
if (main->curlib->packedfile) {
PackedFile *pf = main->curlib->packedfile;
writestruct(wd, DATA, "PackedFile", 1, pf);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
