[Bf-blender-cvs] [96e507d9890] master: Fix T53509: Datablock ID Properties attached to bpy.types.Material are not loaded.

[Bastien Montagne]

Commit: 96e507d9890e42695ea0c6bff0c8fa5c480bbb5a
Author: Bastien Montagne
Date:   Mon Jan 8 09:37:56 2018 +0100
Branches: master
https://developer.blender.org/rB96e507d9890e42695ea0c6bff0c8fa5c480bbb5a

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.

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/blenloader/intern/readfile.c

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 47700dfc983..cd65bc3277e 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 47700dfc9835ef7154bbd34b8725c8abf2f290df
+Subproject commit cd65bc3277eda27e1c0b9f20a25928f6586d89a8
diff --git a/release/scripts/addons b/release/scripts/addons
index 6cdbffbc229..f5536e5e49c 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 6cdbffbc229bf263fa4b9b82a6e33b591c32934c
+Subproject commit f5536e5e49c34dfc0a7b8990257cd393339e23c6
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index e88b7dfc3bd..310578043de 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit e88b7dfc3bd68888be2d05437cf50e93e41ef47b
+Subproject commit 310578043dec1aae382eb6a447ae1d103792d7e6
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index f43eecffe60..37e41fa8968 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -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);