svn merge ^/trunk/blender -r43392:43420
[blender-staging.git] / source / blender / blenloader / intern / readfile.c
index 0328be060cc4832920f2d185d6114faf6f040da1..7e1634d6eca50790b101a36c93a42c459b4ad61f 100644 (file)
@@ -5239,7 +5239,6 @@ static void lib_link_screen(FileData *fd, Main *main)
                                        }
                                        else if(sl->spacetype==SPACE_BUTS) {
                                                SpaceButs *sbuts= (SpaceButs *)sl;
                                        }
                                        else if(sl->spacetype==SPACE_BUTS) {
                                                SpaceButs *sbuts= (SpaceButs *)sl;
-                                               sbuts->ri= NULL;
                                                sbuts->pinid= newlibadr(fd, sc->id.lib, sbuts->pinid);
                                                sbuts->mainbo= sbuts->mainb;
                                                sbuts->mainbuser= sbuts->mainb;
                                                sbuts->pinid= newlibadr(fd, sc->id.lib, sbuts->pinid);
                                                sbuts->mainbo= sbuts->mainb;
                                                sbuts->mainbuser= sbuts->mainb;
@@ -14517,7 +14516,7 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
                                        /* allow typing in a new lib path */
                                        if(G.rt==-666) {
                                                while(fd==NULL) {
                                        /* allow typing in a new lib path */
                                        if(G.rt==-666) {
                                                while(fd==NULL) {
-                                                       char newlib_path[240] = { 0 };
+                                                       char newlib_path[FILE_MAX] = { 0 };
                                                        printf("Missing library...'\n");
                                                        printf("        current file: %s\n", G.main->name);
                                                        printf("        absolute lib: %s\n", mainptr->curlib->filepath);
                                                        printf("Missing library...'\n");
                                                        printf("        current file: %s\n", G.main->name);
                                                        printf("        absolute lib: %s\n", mainptr->curlib->filepath);