diff options
| author | Andrea Weikert <elubie@gmx.net> | 2005-12-22 01:21:43 +0300 |
|---|---|---|
| committer | Andrea Weikert <elubie@gmx.net> | 2005-12-22 01:21:43 +0300 |
| commit | 80eb4d3b9e851c19638599b1821a083dc5a2f635 (patch) | |
| tree | bfb42679c33f19c498d3f682924ffc3e40a5d482 /source/blender/blenloader | |
| parent | 15766e1612040c41ed66fe618af1d28ab3c6d1ec (diff) | |
Big commit in orange: Interface icons for materials, textures
world and lamp. Also for images in pupmenus.
Also preparation for work on using preview images in imagebrowser.
-- Andrea
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index a17f429b828..bf6928b7b20 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -126,7 +126,7 @@ #include "BKE_utildefines.h" // SWITCH_INT DATA ENDB DNA1 O_BINARY GLOB USER TEST REND #include "BIF_butspace.h" // for do_versions, patching event codes - +#include "BIF_previewrender.h" // for struct RenderInfo #include "BLO_readfile.h" #include "BLO_undofile.h" #include "BLO_readblenfile.h" // streaming read pipe, for BLO_readblenfile BLO_readblenfilememory @@ -2766,8 +2766,8 @@ static void lib_link_screen(FileData *fd, Main *main) } else if(sl->spacetype==SPACE_BUTS) { SpaceButs *sbuts= (SpaceButs *)sl; - sbuts->rect= NULL; sbuts->lockpoin= NULL; + sbuts->ri= NULL; if(main->versionfile<132) set_rects_butspace(sbuts); } else if(sl->spacetype==SPACE_FILE) { @@ -2935,7 +2935,7 @@ void lib_link_screen_restore(Main *newmain, Scene *curscene) else if(sl->spacetype==SPACE_BUTS) { SpaceButs *sbuts= (SpaceButs *)sl; sbuts->lockpoin= NULL; - sbuts->cury= 0; // we leave rect, for nicer redraws + if (sbuts->ri) sbuts->ri->cury = 0; } else if(sl->spacetype==SPACE_FILE) { SpaceFile *sfile= (SpaceFile *)sl; @@ -3247,6 +3247,7 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, int flag, ID id->lib= main->curlib; if(id->flag & LIB_FAKEUSER) id->us= 1; else id->us= 0; + id->icon_id = 0; /* this case cannot be direct_linked: it's just the ID part */ if(bhead->code==ID_ID) { |