diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-16 15:50:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-16 15:50:17 +0400 |
| commit | 944dfa23c451464c72ffd82f6987490a47ff3b02 (patch) | |
| tree | 9ca3b7df7f3df21c5b403589262b8f73965f99e3 /source/blender/blenloader | |
| parent | 03b43a0db02028a0a41f0c141cd5ef1b661e5766 (diff) | |
| parent | 3123ad12a395031a1bf5a964582762a3831e9b1c (diff) | |
svn merge ^/trunk/blender -r43392:43420
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 0328be060cc..7e1634d6eca 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5239,7 +5239,6 @@ static void lib_link_screen(FileData *fd, Main *main) } 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; @@ -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) { - 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); |