Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2018-01-08 11:37:56 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-01-08 11:37:56 +0300
commit96e507d9890e42695ea0c6bff0c8fa5c480bbb5a (patch)
treee8db68a99f1322d6f34a034101b675916ee77656
parenta7b4f98e731f66335e74d93ca2b95e5ba73ca9ca (diff)
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/locale0
m---------release/scripts/addons0
m---------release/scripts/addons_contrib0
-rw-r--r--source/blender/blenloader/intern/readfile.c4
4 files changed, 0 insertions, 4 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject 47700dfc9835ef7154bbd34b8725c8abf2f290d
+Subproject cd65bc3277eda27e1c0b9f20a25928f6586d89a
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject 6cdbffbc229bf263fa4b9b82a6e33b591c32934
+Subproject f5536e5e49c34dfc0a7b8990257cd393339e23c
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject e88b7dfc3bd68888be2d05437cf50e93e41ef47
+Subproject 310578043dec1aae382eb6a447ae1d103792d7e
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);