[Bf-blender-cvs] [b65933e7b31] master: Fix T54019: copying and linking bugs with custom ID pointer properties.

Bogdan Nagirniak noreply at git.blender.org
Mon Mar 19 22:17:56 CET 2018


Commit: b65933e7b313c5dd857280dd5cc4fb9c44e0e83d
Author: Bogdan Nagirniak
Date:   Mon Mar 19 22:12:55 2018 +0100
Branches: master
https://developer.blender.org/rBb65933e7b313c5dd857280dd5cc4fb9c44e0e83d

Fix T54019: copying and linking bugs with custom ID pointer properties.

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

M	source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index e1059a50412..723d7747a04 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9211,15 +9211,15 @@ static void expand_nodetree(FileData *fd, Main *mainvar, bNodeTree *ntree)
 		expand_idprops(fd, mainvar, node->prop);
 
 		for (sock = node->inputs.first; sock; sock = sock->next)
-			expand_doit(fd, mainvar, sock->prop);
+			expand_idprops(fd, mainvar, sock->prop);
 		for (sock = node->outputs.first; sock; sock = sock->next)
-			expand_doit(fd, mainvar, sock->prop);
+			expand_idprops(fd, mainvar, sock->prop);
 	}
 
 	for (sock = ntree->inputs.first; sock; sock = sock->next)
-		expand_doit(fd, mainvar, sock->prop);
+		expand_idprops(fd, mainvar, sock->prop);
 	for (sock = ntree->outputs.first; sock; sock = sock->next)
-		expand_doit(fd, mainvar, sock->prop);
+		expand_idprops(fd, mainvar, sock->prop);
 }
 
 static void expand_texture(FileData *fd, Main *mainvar, Tex *tex)



More information about the Bf-blender-cvs mailing list