[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56846] tags/blender-2.67a-release/blender /source/blender/blenloader/intern/readfile.c: svn merge ^/trunk/ blender -c56611

[Lukas Toenne]

Revision: 56846
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56846
Author:   lukastoenne
Date:     2013-05-16 10:01:37 +0000 (Thu, 16 May 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c56611

Modified Paths:
--------------
    
tags/blender-2.67a-release/blender/source/blender/blenloader/intern/readfile.c

Modified: 
tags/blender-2.67a-release/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- 
tags/blender-2.67a-release/blender/source/blender/blenloader/intern/readfile.c  
    2013-05-16 10:01:34 UTC (rev 56845)
+++ 
tags/blender-2.67a-release/blender/source/blender/blenloader/intern/readfile.c  
    2013-05-16 10:01:37 UTC (rev 56846)
@@ -2526,9 +2526,11 @@
                                                        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 @@
                                                        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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs