sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T37945: Crash after undo

Browse Source 
Issue was caused by some typos in readfile.c made in
original commit of image cache rewrite.
This commit is contained in:
Sergey Sharybin 2013-12-26 16:34:57 +06:00
parent bc1eb0bf0a
commit 7025a1bd78
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenloader/intern/readfile.c
View File

@ -1354,7 +1354,13 @@ void blo_end_image_pointer_map(FileData *fd, Main *oldmain)
}
for (; ima; ima = ima->id.next) {
ima->cache = newmclipadr(fd, ima->cache);
ima->cache = newimaadr(fd, ima->cache);
if (ima->cache == NULL) {
ima->bindcode = 0;
ima->tpageflag &= ~IMA_GLBIND_IS_DATA;
ima->gputexture = NULL;
ima->rr = NULL;
}
for (i = 0; i < IMA_MAX_RENDER_SLOT; i++)
ima->renders[i] = newimaadr(fd, ima->renders[i]);
@ -3277,7 +3283,7 @@ static void direct_link_image(FileData *fd, Image *ima)
ima->cache = NULL;
/* if not restored, we keep the binded opengl index */
if (!fd->imamap) {
if (!ima->cache) {
ima->bindcode = 0;
ima->tpageflag &= ~IMA_GLBIND_IS_DATA;
ima->gputexture = NULL;