diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-11-30 12:45:16 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-11-30 12:45:16 +0300 |
commit | a8c884c3ba288c45c9ebc0d5bb2bb9b7c7d17766 (patch) | |
tree | 61a860e4e1b3e223496e5591a8e6416559d03b56 /source/blender/blenloader | |
parent | cff0dfea9aac21da17a19a09c67ba52d10d104df (diff) |
Fix T58279: crush when load this scene _ with simple materials and simple objects.
Not sure why eevee's light_cache is NULL in that file, but this can be
handled gracefully instead of crashing. ;)
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 229d0d04423..acf6ead7d96 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6550,9 +6550,9 @@ static void direct_link_scene(FileData *fd, Scene *sce) else sce->eevee.light_cache = NULL; } else { - /* else read the cache from file. */ + /* else try to read the cache from file. */ + sce->eevee.light_cache = newdataadr(fd, sce->eevee.light_cache); if (sce->eevee.light_cache) { - sce->eevee.light_cache = newdataadr(fd, sce->eevee.light_cache); direct_link_lightcache(fd, sce->eevee.light_cache); } } |