[Bf-blender-cvs] [0c365472b6f] blender-v2.79a-release: Fix T53509: Datablock ID Properties attached to bpy.types.Material are not loaded.

Bastien Montagne noreply at git.blender.org
Mon Jan 8 17:24:06 CET 2018


Commit: 0c365472b6f19378f276ec8a0c8ece5d61324a87
Author: Bastien Montagne
Date:   Mon Jan 8 09:37:56 2018 +0100
Branches: blender-v2.79a-release
https://developer.blender.org/rB0c365472b6f19378f276ec8a0c8ece5d61324a87

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	source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index f224f0b5633..d9515c4b6d2 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3964,10 +3964,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);



More information about the Bf-blender-cvs mailing list