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

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
Notes: blender-bot 2023-02-14 06:20:45 +01:00
Referenced by issue #53683, 2.79a release
Referenced by issue #53509, Datablock ID Properties attached to bpy.types.Material are not saved (or loaded)
4 changed files with 3 additions and 7 deletions

@ -1 +1 @@
Subproject commit 47700dfc9835ef7154bbd34b8725c8abf2f290df
Subproject commit cd65bc3277eda27e1c0b9f20a25928f6586d89a8

@ -1 +1 @@
Subproject commit 6cdbffbc229bf263fa4b9b82a6e33b591c32934c
Subproject commit f5536e5e49c34dfc0a7b8990257cd393339e23c6

@ -1 +1 @@
Subproject commit e88b7dfc3bd68888be2d05437cf50e93e41ef47b
Subproject commit 310578043dec1aae382eb6a447ae1d103792d7e6

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