blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T61172: Crash in texture paint undo/redo 

Mixing texture paint undo w/ memfile undo was crashing.

The gputextures and render result are written to the FileData.imamap
but weren't read back.
This commit is contained in:
Campbell Barton 2019-02-04 19:50:46 +11:00
parent 55c29e36dc
commit 87aa456ea5
Notes: blender-bot 2023-02-14 03:55:10 +01:00 
Referenced by issue #61172, Undo: texture paint redo crashes
Referenced by issue #60954, Texture Paint behaving weird on Ctrl + Z sometimes
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3938,6 +3938,12 @@ static void direct_link_image(FileData *fd, Image *ima)
}
ima->rr = NULL;
}
else {
for (int i = 0; i < TEXTARGET_COUNT; i++) {
ima->gputexture[i] = newimaadr(fd, ima->gputexture[i]);
}
ima->rr = newimaadr(fd, ima->rr);
}
/* undo system, try to restore render buffers */
link_list(fd, &(ima->renderslots));