Commit: 4c224e861bb2dc6d8bae7ff9237e7f5dda640e76
Author: Bastien Montagne
Date: Fri Dec 30 12:27:30 2016 +0100
Branches: id_override_static
https://developer.blender.org/rB4c224e861bb2dc6d8bae7ff9237e7f5dda640e76
Merge branch 'master' into override_static
Conflicts:
source/blender/blenloader/intern/readfile.c
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/readfile.c
index 651d2c8,a63b9ed..c6aad1b
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -8623,10 -8586,19 +8630,22 @@@ BlendFileData *blo_read_file_internal(F
lib_link_all(fd, bfd->main);
+ /* Skip in undo case. */
+ if (fd->memfile == NULL) {
+ /* Yep, second splitting... but this is a very cheap operation,
so no big deal. */
+ blo_split_main(&mainlist, bfd->main);
+ for (Main *mainvar = mainlist.first; mainvar; mainvar =
mainvar->next) {
+ BLI_assert(mainvar->versionfile != 0);
+ do_versions_after_linking(mainvar);
+ }
+ blo_join_main(&mainlist);
+ }
+
+ BKE_main_id_tag_all(bfd->main, LIB_TAG_NEW, false);
+
+ /* Now that all our data-blocks are loaded, we can re-generate
overrides from their references. */
+ BKE_main_override_update(bfd->main);
+
- //do_versions_after_linking(fd, NULL, bfd->main); // XXX: not here (or
even in this function at all)! this causes crashes on many files - Aligorith
(July 04, 2010)
lib_verify_nodetree(bfd->main, true);
fix_relpaths_library(fd->relabase, bfd->main); /* make all relative
paths, relative to the open blend file */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
