projects
/
blender-staging.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
svn merge -r40279:40295 ^/trunk/blender
[blender-staging.git]
/
source
/
blender
/
blenloader
/
intern
/
readfile.c
diff --git
a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 6099331b75be2cedcd0c7db99c4b12be9514a4cd..2bf71586e295ea2546cd17662de9379ed16e060e 100644
(file)
--- a/
source/blender/blenloader/intern/readfile.c
+++ b/
source/blender/blenloader/intern/readfile.c
@@
-2144,7
+2144,7
@@
static void lib_verify_nodetree(Main *main, int UNUSED(open))
ntreetype->foreach_nodetree(main, NULL, lib_nodetree_init_types_cb);
}
for(ntree= main->nodetree.first; ntree; ntree= ntree->id.next)
-
ntreeInitTypes(
ntree);
+
lib_nodetree_init_types_cb(NULL, NULL,
ntree);
{
int has_old_groups=0;