From 66181332814f3128254622eada820a42a968c10b Mon Sep 17 00:00:00 2001 From: Lukas Toenne Date: Thu, 16 May 2013 10:01:37 +0000 Subject: svn merge ^/trunk/blender -c56611 --- source/blender/blenloader/intern/readfile.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'source') diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 5e01b03cd64..a76d7eaff6d 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -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; -- cgit v1.2.3