[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55750] trunk/blender/source/blender/ blenloader/intern/readfile.c: Fix #34838, Can not append mesh from 2.5 ( Crash in Nodes).

[Lukas Toenne]

Revision: 55750
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55750
Author:   lukastoenne
Date:     2013-04-03 08:25:29 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
Fix #34838, Can not append mesh from 2.5 (Crash in Nodes). The compatibility code for node group socket indices was assuming the new group node types even for 2.56.2 files, before these node groups had actually been converted ... Needs to use old way of identifying node group links (fromnode/tonode == NULL) instead of input/output node types.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2013-04-03 07:56:36 UTC (rev 55749)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2013-04-03 08:25:29 UTC (rev 55750)
@@ -2373,7 +2373,7 @@
 		int old_index = sock->to_index;
 		
 		for (link = ngroup->links.first; link; link = link->next) {
-			if (link->tonode->type == NODE_GROUP_OUTPUT && link->fromsock->own_index == old_index) {
+			if (link->tonode == NULL && link->fromsock->own_index == old_index) {
 				strcpy(sock->identifier, link->fromsock->identifier);
 				/* deprecated */
 				sock->own_index = link->fromsock->own_index;
@@ -2386,7 +2386,7 @@
 		int old_index = sock->to_index;
 		
 		for (link = ngroup->links.first; link; link = link->next) {
-			if (link->fromnode->type == NODE_GROUP_INPUT && link->tosock->own_index == old_index) {
+			if (link->fromnode == NULL && link->tosock->own_index == old_index) {
 				strcpy(sock->identifier, link->tosock->identifier);
 				/* deprecated */
 				sock->own_index = link->tosock->own_index;