Commit: 718f8fe55fcc353a2715a71cdb2c96e27aad25f9
Author: Bastien Montagne
Date: Thu Apr 7 15:25:23 2016 +0200
Branches: asset-experiments
https://developer.blender.org/rB718f8fe55fcc353a2715a71cdb2c96e27aad25f9
Merge branch 'master' into asset-experiments
Conflicts:
source/blender/blenkernel/BKE_library_query.h
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/library_query.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/blender.c
index af3e4ee,baf93ff..9575b76
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@@ -553,10 -539,7 +564,10 @@@ int BKE_read_file(bContext *C, const ch
retval = BKE_READ_FILE_FAIL;
}
else {
- setup_app_data(C, bfd, filepath); // frees BFD
- setup_app_data(C, bfd, filepath, reports);
++ setup_app_data(C, bfd, filepath, reports); // frees BFD
+
+ printf("Updating assets for: %s\n", filepath);
+ read_file_update_assets(C);
}
}
else
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
