[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47333] trunk/blender/source/blender/ blenloader/intern/readfile.c: Fix #31673, File Output node forgets about socket names.

[Lukas Toenne]

Revision: 47333
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47333
Author:   lukastoenne
Date:     2012-06-01 15:16:58 +0000 (Fri, 01 Jun 2012)
Log Message:
-----------
Fix #31673, File Output node forgets about socket names. Was checking for wrong file version for do_versions.

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	2012-06-01 15:05:30 UTC (rev 47332)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-06-01 15:16:58 UTC (rev 47333)
@@ -6728,7 +6728,7 @@
 	}
 }
 
-static void do_versions_nodetree_multi_file_output_path_2_64_0(bNodeTree *ntree)
+static void do_versions_nodetree_multi_file_output_path_2_63_1(bNodeTree *ntree)
 {
 	bNode *node;
 	
@@ -6739,7 +6739,6 @@
 				NodeImageMultiFileSocket *input = sock->storage;
 				/* input file path is stored in dedicated struct now instead socket name */
 				BLI_strncpy(input->path, sock->name, sizeof(input->path));
-				sock->name[0] = '\0';	/* unused */
 			}
 		}
 	}
@@ -7340,20 +7339,18 @@
 			for (part = main->particle.first; part; part = part->id.next)
 				part->flag |= PART_ROTATIONS;
 		}
-		{
-			/* file output node paths are now stored in the file info struct instead socket name */
-			Scene *sce;
-			bNodeTree *ntree;
-			
-			for (sce = main->scene.first; sce; sce=sce->id.next)
-				if (sce->nodetree)
-					do_versions_nodetree_multi_file_output_path_2_64_0(sce->nodetree);
-			for (ntree = main->nodetree.first; ntree; ntree=ntree->id.next)
-				do_versions_nodetree_multi_file_output_path_2_64_0(ntree);
-		}
+	}
 
-
-
+	if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 1)) {
+		/* file output node paths are now stored in the file info struct instead socket name */
+		Scene *sce;
+		bNodeTree *ntree;
+		
+		for (sce = main->scene.first; sce; sce=sce->id.next)
+			if (sce->nodetree)
+				do_versions_nodetree_multi_file_output_path_2_63_1(sce->nodetree);
+		for (ntree = main->nodetree.first; ntree; ntree=ntree->id.next)
+			do_versions_nodetree_multi_file_output_path_2_63_1(ntree);
 	}
 
 	if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 3)) {