svn merge -r 13177:13240 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / blenloader / intern / readfile.c
index 54d405132a90dd4af026b0aea7aaf8f1a9b17685..dbc2a658ea94adde8eb03a5f9a00fcfa0f42d91a 100644 (file)
@@ -3482,6 +3482,7 @@ static void direct_link_scene(FileData *fd, Scene *sce)
        }
        
        link_list(fd, &(sce->markers));
        }
        
        link_list(fd, &(sce->markers));
+       link_list(fd, &(sce->transform_spaces));
        link_list(fd, &(sce->r.layers));
        
        sce->nodetree= newdataadr(fd, sce->nodetree);
        link_list(fd, &(sce->r.layers));
        
        sce->nodetree= newdataadr(fd, sce->nodetree);
@@ -7295,6 +7296,10 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                                strip->scale = length / (repeat * actlength);
                                if (strip->scale == 0.0f) strip->scale= 1.0f;
                        }       
                                strip->scale = length / (repeat * actlength);
                                if (strip->scale == 0.0f) strip->scale= 1.0f;
                        }       
+                       if(ob->soft){
+                               ob->soft->inpush =  ob->soft->inspring;
+                               ob->soft->shearstiff = 1.0f; 
+                       }
                }
        }
 
                }
        }