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:
authorBogdan Nagirniak <bnagirniak>2018-03-20 00:12:55 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-03-20 00:14:02 +0300
commitb65933e7b313c5dd857280dd5cc4fb9c44e0e83d (patch)
treec7c99d2800e5d60458eebdeb5e505bb6213212bd /source/blender/blenloader/intern
parent8ecf35d850fd17d44a60bcbea723d542d2139774 (diff)
Fix T54019: copying and linking bugs with custom ID pointer properties.
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r--source/blender/blenloader/intern/readfile.c8
1 files changed, 4 insertions, 4 deletions
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)