diff options
| author | Joshua Leung <aligorith@gmail.com> | 2018-03-20 06:13:37 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2018-03-20 06:13:37 +0300 |
| commit | c8a7c4f245391717f10ed4d67e38d955b64a6f44 (patch) | |
| tree | 4e64328a93ee3797fed5e3e34031a0be3885a22e /source/blender/blenloader | |
| parent | 84536d1d3ce217a44877acdc9845254249c040ce (diff) | |
| parent | 8e5c407fc446b35042c626e7d60ff9a2336093f4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 21eccaff168..87e75384476 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9504,15 +9504,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) |