[Bf-blender-cvs] [eb55990777a] master: Fix T60213: crash loading .blend file with material override.

Brecht Van Lommel noreply at git.blender.org
Sun Jan 6 15:43:44 CET 2019


Commit: eb55990777a41c9135f20304365ae696fa2ce1b5
Author: Brecht Van Lommel
Date:   Sun Jan 6 15:22:47 2019 +0100
Branches: master
https://developer.blender.org/rBeb55990777a41c9135f20304365ae696fa2ce1b5

Fix T60213: crash loading .blend file with material override.

===================================================================

M	source/blender/blenloader/intern/readfile.c

===================================================================

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);
 }



More information about the Bf-blender-cvs mailing list