svn merge ^/trunk/blender -r47325:47381

[blender-staging.git] / source / blender / blenloader / intern / readfile.c

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 602c410dc2100a0512ae6fd811a67199acb4ca87..23939cc1aae4ec4bd560dfd85f2e2a24b7a51dcc 100644 (file)
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6817,7 +6817,7 @@ static void do_versions_mesh_mloopcol_swap_2_62_1(Mesh *me)
        }
 }
 
-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;
        
@@ -6828,7 +6828,6 @@ static void do_versions_nodetree_multi_file_output_path_2_64_0(bNodeTree *ntree)
                                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 */
                        }
                }
        }
@@ -7425,20 +7424,18 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                        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)) {