griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for do_versions bug with node groups: The special case of direct input-to-output connections was not handled correctly. In this case both the tonode and fromnode pointers in old node groups are NULL.

Browse Source
This commit is contained in:
Lukas Toenne
2013-05-09 08:29:59 +00:00
parent 89d77c538a
commit 3fb67ac16d
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2526,9 +2526,11 @@ static void lib_verify_nodetree(Main *main, int UNUSED(open))
link->fromsock = node_group_input_find_socket(input_node, link->fromsock->identifier);
++num_inputs;
if (input_locx > link->tonode->locx - offsetx)
input_locx = link->tonode->locx - offsetx;
input_locy += link->tonode->locy;
if (link->tonode) {
if (input_locx > link->tonode->locx - offsetx)
input_locx = link->tonode->locx - offsetx;
input_locy += link->tonode->locy;
}
}
else
free_link = TRUE;
@@ -2540,9 +2542,11 @@ static void lib_verify_nodetree(Main *main, int UNUSED(open))
link->tosock = node_group_output_find_socket(output_node, link->tosock->identifier);
++num_outputs;
if (output_locx < link->fromnode->locx + offsetx)
output_locx = link->fromnode->locx + offsetx;
output_locy += link->fromnode->locy;
if (link->fromnode) {
if (output_locx < link->fromnode->locx + offsetx)
output_locx = link->fromnode->locx + offsetx;
output_locy += link->fromnode->locy;
}
}
else
free_link = TRUE;