blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Merge branch 'blender2.8' into soc-2018-bevel

This commit is contained in:
Rohan Rathi 2018-06-11 21:24:51 +05:30
parent 1255129932 c31bc465ea
commit b5f67bfd83
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/node.c
View File

@ -1684,7 +1684,7 @@ static void node_free_node_ex(bNodeTree *ntree, bNode *node, bool remove_animdat
remove_animdata &= ntree && !(ntree->flag & NTREE_IS_LOCALIZED);
/* extra free callback */
if (use_api_free_cb && node->typeinfo != NULL && node->typeinfo->freefunc_api) {
if (use_api_free_cb && node->typeinfo->freefunc_api) {
PointerRNA ptr;
RNA_pointer_create((ID *)ntree, &RNA_Node, node, &ptr);
@ -1711,7 +1711,7 @@ static void node_free_node_ex(bNodeTree *ntree, bNode *node, bool remove_animdat
BKE_animdata_fix_paths_remove((ID *)ntree, prefix);
}
if (node->typeinfo != NULL && ntree->typeinfo->free_node_cache)
if (ntree->typeinfo->free_node_cache)
ntree->typeinfo->free_node_cache(ntree, node);
/* texture node has bad habit of keeping exec data around */
@ -1721,7 +1721,7 @@ static void node_free_node_ex(bNodeTree *ntree, bNode *node, bool remove_animdat
}
}
if (node->typeinfo != NULL && node->typeinfo->freefunc) {
if (node->typeinfo->freefunc) {
node->typeinfo->freefunc(node);
}

1
source/blender/blenloader/intern/readfile.c
View File

@ -8833,6 +8833,7 @@ BlendFileData *blo_read_file_internal(FileData *fd, const char *filepath)
/* Now that all our data-blocks are loaded, we can re-generate overrides from their references. */
if (fd->memfile == NULL) {
/* Do not apply in undo case! */
lib_verify_nodetree(bfd->main, true); /* Needed to ensure we have typeinfo in nodes... */
BKE_main_override_static_update(bfd->main);
BKE_collections_after_lib_link(bfd->main);
}