Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T53509: Datablock ID Properties attached to bpy.types.Material are not loaded.

Browse Source 
Stupid mistake in material reading code, thanks to Simon Wendsche (@BYOB) for the investigation and fix!

To be backported to 2.79a.
This commit is contained in:
Bastien Montagne
2018-01-08 09:37:56 +01:00
parent a7b4f98e73
commit 96e507d989
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/locale

Submodule release/datafiles/locale updated: 47700dfc98...cd65bc3277

2
release/scripts/addons

Submodule release/scripts/addons updated: 6cdbffbc22...f5536e5e49

2
release/scripts/addons_contrib

Submodule release/scripts/addons_contrib updated: e88b7dfc3b...310578043d

4
source/blender/blenloader/intern/readfile.c
View File

@@ -3966,10 +3966,6 @@ static void lib_link_material(FileData *fd, Main *main)
IDP_LibLinkProperty(ma->id.properties, fd);
lib_link_animdata(fd, &ma->id, ma->adt);
/* Link ID Properties -- and copy this comment EXACTLY for easy finding
* of library blocks that implement this.*/
IDP_LibLinkProperty(ma->id.properties, fd);
ma->ipo = newlibadr_us(fd, ma->id.lib, ma->ipo); // XXX deprecated - old animation system
ma->group = newlibadr_us(fd, ma->id.lib, ma->group);