diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-06 17:22:47 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-06 17:24:02 +0300 |
| commit | eb55990777a41c9135f20304365ae696fa2ce1b5 (patch) | |
| tree | 0cb66c44989243f284e1f662394e39153c231ea4 /source/blender/blenloader | |
| parent | 53d6f40760e928ee0fbcb9568659e718fd2fb338 (diff) | |
Fix T60213: crash loading .blend file with material override.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index bcf480c1e9f..2817f3abac0 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5748,6 +5748,8 @@ static void lib_link_view_layer(FileData *fd, Library *lib, ViewLayer *view_laye lib_link_layer_collection(fd, lib, layer_collection, true); } + view_layer->mat_override = newlibadr_us(fd, lib, view_layer->mat_override); + IDP_LibLinkProperty(view_layer->id_properties, fd); } |