[Bf-blender-cvs] [3ede515b5b] master: Use dummy versionning numbers for missing libraries.
Bastien Montagne
noreply at git.blender.org
Fri Feb 10 22:59:18 CET 2017
Commit: 3ede515b5b3b1770bda66da3aaa9857543a34ff0
Author: Bastien Montagne
Date: Fri Feb 10 22:49:22 2017 +0100
Branches: master
https://developer.blender.org/rB3ede515b5b3b1770bda66da3aaa9857543a34ff0
Use dummy versionning numbers for missing libraries.
We now assert that we now file version of libraries (needed for
do_version after linking step), so for missing libraries, set dummy
numbers (using version of main .blend file actually).
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 6264336c09..7ea79fc555 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -10395,6 +10395,9 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
else {
mainptr->curlib->filedata = NULL;
mainptr->curlib->id.tag |= LIB_TAG_MISSING;
+ /* Set lib version to current main one... Makes assert later happy. */
+ mainptr->versionfile = mainptr->curlib->versionfile = mainl->versionfile;
+ mainptr->subversionfile = mainptr->curlib->subversionfile = mainl->subversionfile;
}
if (fd == NULL) {
More information about the Bf-blender-cvs
mailing list