diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-01-05 13:31:27 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-01-05 13:31:27 +0300 |
| commit | 776b2451e10963a07bf37e979d3c4b6e24a132f7 (patch) | |
| tree | 5d38c71fe177e993a937be85411a7655312540b3 /source/blender/blenloader | |
| parent | 5b0815ca8e23be1b82a8b0139549395485c0398b (diff) | |
Bugfix #2095
When loading a file with linked external scene, and that external scene
didnt exist anymore, and that scene was active in the file -> crash!
Render code; changed to use local 'puno' flag for threaded render.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 9efdb1f90f3..3a8fdb69d7a 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5534,10 +5534,11 @@ static void read_libraries(FileData *basefd, ListBase *mainlist) fd->libmap= basefd->libmap; fd->flags|= FD_FLAGS_NOT_MY_LIBMAP; + + mainptr->curlib->filedata= fd; + mainptr->versionfile= fd->fileversion; } - - mainptr->curlib->filedata= fd; - mainptr->versionfile= fd->fileversion; + else mainptr->curlib->filedata= NULL; if (!fd) printf("ERROR: can't find lib %s \n", mainptr->curlib->name); |